removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework

153 files changed, 2456 insertions, 2718 deletions

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index d6dd418d30d6..de24ee12e98a 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -806,7 +806,6 @@
 #include "svtools/parhtml.hxx"
 #include "svtools/parrtf.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
 #include "svl/poolitem.hxx"
 #include "unotools/printwarningoptions.hxx"
 #include "svl/ptitem.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a75a7cf1f24d..c0869ce94f30 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1366,133 +1366,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG
     return 0;
 }
 
-::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL )
-{
-    ::rtl::OUString aLabel;
-    if ( aCmdURL.getLength() )
-    {
-        try
-        {
-            uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
-            if ( xNameAccess.is() )
-            {
-                uno::Reference< container::XNameAccess > xUICommandLabels;
-                const ::rtl::OUString aModule( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) );
-                uno::Any a = xNameAccess->getByName( aModule );
-                uno::Reference< container::XNameAccess > xUICommands;
-                a >>= xUICommandLabels;
-                rtl::OUString aStr;
-                uno::Sequence< beans::PropertyValue > aPropSeq;
-                a = xUICommandLabels->getByName( aCmdURL );
-                if ( a >>= aPropSeq )
-                {
-                    for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                    {
-                        if ( aPropSeq[i].Name.equalsAscii( "Name" ))
-                        {
-                            aPropSeq[i].Value >>= aStr;
-                            break;
-                        }
-                    }
-                }
-                aLabel = aStr;
-            }
-        }
-        catch ( uno::Exception& )
-        {
-        }
-    }
-
-    return aLabel;
-}
-
-
-//-----------------------------------------------
-String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
-{
-    ::rtl::OUStringBuffer sName(256);
-    sName.appendAscii("\"");
-    switch(eType)
-    {
-        case KEYFUNC_NEW :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) );
-            break;
-
-        case KEYFUNC_OPEN :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) );
-            break;
-
-        case KEYFUNC_SAVE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) );
-            break;
-
-        case KEYFUNC_SAVEAS :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) );
-            break;
-
-        case KEYFUNC_PRINT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) );
-            break;
-
-        case KEYFUNC_CLOSE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) );
-            break;
-
-        case KEYFUNC_QUIT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) );
-            break;
-
-        case KEYFUNC_CUT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) );
-            break;
-
-        case KEYFUNC_COPY :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) );
-            break;
-
-        case KEYFUNC_PASTE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) );
-            break;
-
-        case KEYFUNC_UNDO :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) );
-            break;
-
-        case KEYFUNC_REDO :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) );
-            break;
-
-        case KEYFUNC_DELETE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) );
-            break;
-
-        case KEYFUNC_REPEAT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) );
-            break;
-
-        case KEYFUNC_FIND :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) );
-            break;
-
-        case KEYFUNC_FINDBACKWARD :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) );
-            break;
-
-        case KEYFUNC_PROPERTIES :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) );
-            break;
-
-        case KEYFUNC_FRONT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) );
-            break;
-
-        default:
-            break;
-    }
-    sName.appendAscii("\"");
-    return String(sName.makeStringAndClear());
-}
-
 //-----------------------------------------------
 void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTitle )
 {
@@ -1504,7 +1377,6 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
     m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 );
 
     m_pFileDlg->SetTitle( rTitle );
-//  m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD );
     m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
     m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) );
 
@@ -1575,37 +1447,6 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
 }
 
 //-----------------------------------------------
-void SfxAcceleratorConfigPage::SelectMacro(const SfxMacroInfoItem *pItem)
-{
-    m_pMacroInfoItem = pItem;
-    pGroupLBox->SelectMacro( pItem );
-}
-
-//-----------------------------------------------
-void SfxAcceleratorConfigPage::CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
-                                                 const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr)
-{
-    const css::uno::Sequence< css::awt::KeyEvent > lKeys = xSourceAccMgr->getAllKeyEvents();
-          sal_Int32                                c     = lKeys.getLength();
-          sal_Int32                                i     = 0;
-    for (i=0; i<c; ++i)
-    {
-        const css::awt::KeyEvent& rKey     = lKeys[i];
-              ::rtl::OUString     sCommand = xSourceAccMgr->getCommandByKeyEvent(rKey);
-        xTargetAccMgr->setKeyEvent(rKey, sCommand);
-    }
-}
-
-//-----------------------------------------------
-KeyCode SfxAcceleratorConfigPage::MapPosToKeyCode(USHORT nPos) const
-{
-    TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
-    KeyCode aCode(KEYCODE_ARRAY[pEntry->m_nKeyPos] & 0xFFF                 ,
-                  KEYCODE_ARRAY[pEntry->m_nKeyPos] & (KEY_SHIFT | KEY_MOD2));
-    return aCode;
-}
-
-//-----------------------------------------------
 USHORT SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
 {
     USHORT       nCode1 = aKey.GetCode()+aKey.GetModifier();
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 74188426a787..b94ea163e0c7 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -67,18 +67,21 @@ TabPage RID_SVXPAGE_KEYBOARD
     Size = MAP_APPFONT ( 273 , 258 ) ;
     RadioButton RB_OFFICE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
         Pos = MAP_APPFONT ( 192 , 6 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text = "%PRODUCTNAME" ;
     };
     RadioButton RB_MODULE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
         Pos = MAP_APPFONT ( 192 , 19 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text = "$(MODULE)" ;
     };
     PushButton BTN_ACC_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
         Pos = MAP_APPFONT ( 192 , 35 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_ACC_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
         Pos = MAP_APPFONT ( 192 , 52 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -162,6 +166,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_LOAD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
         Pos = MAP_APPFONT ( 192 , 86 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -170,6 +175,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_SAVE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
         Pos = MAP_APPFONT ( 192 , 103 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -178,6 +184,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_RESET
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
         Pos = MAP_APPFONT ( 192 , 120 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d9f730e0224f..a2ee0d977f67 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -112,7 +112,6 @@
 #define ENTRY_HEIGHT 16
 
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[]     = "HelpURL";
 static const char ITEM_DESCRIPTOR_CONTAINER[]   = "ItemDescriptorContainer";
 static const char ITEM_DESCRIPTOR_LABEL[]       = "Label";
 static const char ITEM_DESCRIPTOR_TYPE[]        = "Type";
@@ -144,6 +143,8 @@ namespace container = com::sun::star::container;
 namespace beans = com::sun::star::beans;
 namespace graphic = com::sun::star::graphic;
 
+#if OSL_DEBUG_LEVEL > 1
+
 void printPropertySet(
     const OUString& prefix,
     const uno::Reference< beans::XPropertySet >& xPropSet )
@@ -208,6 +209,8 @@ void printEntries(SvxEntries* entries)
     }
 }
 
+#endif
+
 OUString
 stripHotKey( const OUString& str )
 {
@@ -518,7 +521,6 @@ bool GetMenuItemData(
     const uno::Reference< container::XIndexAccess >& rItemContainer,
     sal_Int32 nIndex,
     OUString& rCommandURL,
-    OUString& rHelpURL,
     OUString& rLabel,
     sal_uInt16& rType,
     uno::Reference< container::XIndexAccess >& rSubMenu )
@@ -534,10 +536,6 @@ bool GetMenuItemData(
                 {
                     aProp[i].Value >>= rCommandURL;
                 }
-                else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
-                {
-                    aProp[i].Value >>= rHelpURL;
-                }
                 else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
                 {
                     aProp[i].Value >>= rSubMenu;
@@ -566,7 +564,6 @@ bool GetToolbarItemData(
     const uno::Reference< container::XIndexAccess >& rItemContainer,
     sal_Int32 nIndex,
     OUString& rCommandURL,
-    OUString& rHelpURL,
     OUString& rLabel,
     sal_uInt16& rType,
     sal_Bool& rIsVisible,
@@ -588,10 +585,6 @@ bool GetToolbarItemData(
                 {
                     aProp[i].Value >>= rStyle;
                 }
-                else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
-                {
-                    aProp[i].Value >>= rHelpURL;
-                }
                 else if (aProp[i].Name.equalsAscii(ITEM_DESCRIPTOR_CONTAINER))
                 {
                     aProp[i].Value >>= rSubMenu;
@@ -634,13 +627,10 @@ ConvertSvxConfigEntry(
     static const OUString aDescriptorLabel(
             RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
 
-    static const OUString aDescriptorHelpURL(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
     static const OUString aDescriptorContainer(
             RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
 
-    uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
+    uno::Sequence< beans::PropertyValue > aPropSeq( 3 );
 
     aPropSeq[0].Name = aDescriptorCommandURL;
     aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() );
@@ -698,9 +688,6 @@ ConvertSvxConfigEntry(
         aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() );
     }
 
-    aPropSeq[3].Name = aDescriptorHelpURL;
-    aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() );
-
     return aPropSeq;
 }
 
@@ -718,16 +705,13 @@ ConvertToolbarEntry(
     static const OUString aDescriptorLabel(
             RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
 
-    static const OUString aDescriptorHelpURL(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
     static const OUString aDescriptorContainer(
             RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
 
     static const OUString aIsVisible(
             RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) );
 
-    uno::Sequence< beans::PropertyValue > aPropSeq( 5 );
+    uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
 
     aPropSeq[0].Name = aDescriptorCommandURL;
     aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() );
@@ -785,11 +769,8 @@ ConvertToolbarEntry(
         aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() );
     }
 
-    aPropSeq[3].Name = aDescriptorHelpURL;
-    aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() );
-
-    aPropSeq[4].Name = aIsVisible;
-    aPropSeq[4].Value <<= pEntry->IsVisible();
+    aPropSeq[3].Name = aIsVisible;
+    aPropSeq[3].Value <<= pEntry->IsVisible();
 
     return aPropSeq;
 }
@@ -918,11 +899,6 @@ void SvxConfigDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
     }
 }
 
-void SvxConfigDialog::ActivateTabPage( USHORT nSlotId )
-{
-    (void)nSlotId;
-}
-
 /******************************************************************************
  *
  * The SaveInData class is used to hold data for entries in the Save In
@@ -1177,20 +1153,23 @@ bool MenuSaveInData::LoadSubMenus(
     const OUString& rBaseTitle,
     SvxConfigEntry* pParentData )
 {
-    SvxEntries*     pEntries            = pParentData->GetEntries();
+    SvxEntries* pEntries = pParentData->GetEntries();
+
+    // Don't access non existing menu configuration!
+    if ( !xMenuSettings.is() )
+        return true;
 
     for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ )
     {
         uno::Reference< container::XIndexAccess >   xSubMenu;
         OUString                aCommandURL;
-        OUString                aHelpURL;
         OUString                aLabel;
         bool                    bIsUserDefined = TRUE;
 
         sal_uInt16 nType( css::ui::ItemType::DEFAULT );
 
         bool bItem = GetMenuItemData( xMenuSettings, nIndex,
-            aCommandURL, aHelpURL, aLabel, nType, xSubMenu );
+            aCommandURL, aLabel, nType, xSubMenu );
 
         if ( bItem )
         {
@@ -1232,7 +1211,6 @@ bool MenuSaveInData::LoadSubMenus(
                         aLabel, aCommandURL, TRUE );
 
                     pEntry->SetUserDefined( bIsUserDefined );
-                    pEntry->SetHelpURL( aHelpURL );
 
                     pEntries->push_back( pEntry );
 
@@ -1257,7 +1235,6 @@ bool MenuSaveInData::LoadSubMenus(
                     SvxConfigEntry* pEntry = new SvxConfigEntry(
                         aLabel, aCommandURL, FALSE );
                     pEntry->SetUserDefined( bIsUserDefined );
-                    pEntry->SetHelpURL( aHelpURL );
                     pEntries->push_back( pEntry );
                 }
             }
@@ -2154,7 +2131,6 @@ SvLBoxEntry* SvxConfigPage::AddFunction(
     SvxConfigEntry* pNewEntryData =
         new SvxConfigEntry( aDisplayName, aURL, FALSE );
     pNewEntryData->SetUserDefined( TRUE );
-    pNewEntryData->SetHelpURL( aURL );
 
     // check that this function is not already in the menu
     SvxConfigEntry* pParent = GetTopLevelSelection();
@@ -2594,17 +2570,20 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
     SvxConfigEntry* pMenuData = GetTopLevelSelection();
 
     PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu();
-    pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
-    pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
-    pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
+    if ( pMenuData )
+    {
+        pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
+        pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
+        pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
 
-    SvxEntries* pEntries = pMenuData->GetEntries();
-    SvxEntries::const_iterator iter = pEntries->begin();
+        SvxEntries* pEntries = pMenuData->GetEntries();
+        SvxEntries::const_iterator iter = pEntries->begin();
 
-    for ( ; iter != pEntries->end(); iter++ )
-    {
-        SvxConfigEntry* pEntry = *iter;
-        InsertEntryIntoUI( pEntry );
+        for ( ; iter != pEntries->end(); iter++ )
+        {
+            SvxConfigEntry* pEntry = *iter;
+            InsertEntryIntoUI( pEntry );
+        }
     }
 
     UpdateButtonStates();
@@ -3055,228 +3034,20 @@ SvxConfigEntry* SvxMainMenuOrganizerDialog::GetSelectedEntry()
     return (SvxConfigEntry*)aMenuListBox.FirstSelected()->GetUserData();
 }
 
-SvxConfigEntry::SvxConfigEntry(
-    const uno::Sequence< beans::PropertyValue >& rProperties,
-    const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
-    :
-        nId( 1 ),
-        bPopUp( FALSE ),
-        bStrEdited( FALSE ),
-        bIsUserDefined( FALSE ),
-        bIsMain( FALSE ),
-        bIsParentData( FALSE ),
-        bIsVisible( TRUE ),
-        nStyle( 0 ),
-        pEntries( 0 )
-{
-    sal_uInt16 nType( css::ui::ItemType::DEFAULT );
-    OUString aHelpURL_;
-
-    for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
-    {
-        if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
-        {
-            rProperties[i].Value >>= aCommand;
-        }
-        else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
-        {
-            rProperties[i].Value >>= aHelpURL_;
-        }
-        else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
-        {
-            rProperties[i].Value >>= aLabel;
-        }
-        else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
-        {
-            rProperties[i].Value >>= nType;
-        }
-    }
-
-    if ( nType == css::ui::ItemType::DEFAULT )
-    {
-        uno::Any a;
-        try
-        {
-            a = rCommandToLabelMap->getByName( aCommand );
-            bIsUserDefined = FALSE;
-        }
-        catch ( container::NoSuchElementException& )
-        {
-            bIsUserDefined = TRUE;
-        }
-
-        // If custom label not set retrieve it from the command to info service
-        if ( aLabel.equals( OUString() ) )
-        {
-            uno::Sequence< beans::PropertyValue > aPropSeq;
-            if ( a >>= aPropSeq )
-            {
-                for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-                {
-                    if ( aPropSeq[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ) )
-                    {
-                        aPropSeq[i].Value >>= aLabel;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
 const OUString&
 SvxConfigEntry::GetHelpText()
 {
     if ( aHelpText.getLength() == 0 )
     {
-        OUString helpid = OUString::createFromAscii( "helpid:" );
-        if ( aHelpURL.indexOf( helpid ) != -1 )
-        {
-            aHelpURL = aHelpURL.copy( helpid.getLength() );
-        }
-
-        Help* pHelp = Application::GetHelp();
-        if ( aHelpURL.toInt32() != 0 )
-        {
-            aHelpText = pHelp->GetHelpText( aHelpURL.toInt32(), NULL );
-        }
-
-        if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 )
+        if ( aCommand.getLength() )
         {
-            aHelpText = pHelp->GetHelpText( aCommand, NULL );
+            aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL );
         }
     }
 
     return aHelpText;
 }
 
-uno::Sequence< beans::PropertyValue >
-SvxConfigEntry::GetProperties(
-    const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
-{
-    if ( IsSeparator() )
-    {
-        uno::Sequence< beans::PropertyValue > aPropSeq( 1 );
-
-        aPropSeq[0].Name  = OUString(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
-        aPropSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE;
-
-        return aPropSeq;
-    }
-
-    static const OUString aDescriptorCommandURL (
-        RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) );
-
-    static const OUString aDescriptorType(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
-
-    static const OUString aDescriptorLabel(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
-
-    static const OUString aDescriptorHelpURL(
-            RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
-    uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
-
-    aPropSeq[0].Name = aDescriptorCommandURL;
-    aPropSeq[0].Value <<= rtl::OUString( GetCommand() );
-
-    aPropSeq[1].Name = aDescriptorType;
-    aPropSeq[1].Value <<= css::ui::ItemType::DEFAULT;
-
-    // If the name has not been changed and the name is the same as
-    // in the default command to label map then the label can be stored
-    // as an empty string.
-    // It will be initialised again later using the command to label map.
-    aPropSeq[2].Name = aDescriptorLabel;
-    if ( HasChangedName() == FALSE && GetCommand().getLength() )
-    {
-        BOOL isDefaultName = FALSE;
-        try
-        {
-            uno::Any a( rCommandToLabelMap->getByName( GetCommand() ) );
-            uno::Sequence< beans::PropertyValue > tmpPropSeq;
-            if ( a >>= tmpPropSeq )
-            {
-                for ( sal_Int32 i = 0; i < tmpPropSeq.getLength(); i++ )
-                {
-                    if ( tmpPropSeq[i].Name.equals( aDescriptorLabel ) )
-                    {
-                        OUString tmpLabel;
-                        tmpPropSeq[i].Value >>= tmpLabel;
-
-                        if ( tmpLabel.equals( GetName() ) )
-                        {
-                            isDefaultName = TRUE;
-                        }
-
-                        break;
-                    }
-                }
-            }
-        }
-        catch ( container::NoSuchElementException& )
-        {
-            // isDefaultName is left as FALSE
-        }
-
-        if ( isDefaultName )
-        {
-            aPropSeq[2].Value <<= rtl::OUString();
-        }
-        else
-        {
-            aPropSeq[2].Value <<= rtl::OUString( GetName() );
-        }
-    }
-    else
-    {
-        aPropSeq[2].Value <<= rtl::OUString( GetName() );
-    }
-
-    aPropSeq[3].Name = aDescriptorHelpURL;
-    aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() );
-
-    return aPropSeq;
-}
-
-/*
-SvxMenuConfigEntry::SvxMenuConfigEntry(
-    const uno::Sequence< beans::PropertyValue >& rProperties,
-    const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
-    :
-        SvxConfigEntry( rProperties, rCommandToLabelMap )
-{
-    uno::Reference< container::XIndexAccess > aChildren;
-
-    for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
-    {
-        if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
-        {
-            rProperties[i].Value >>= aChildren;
-        }
-    }
-
-    if ( aChildren.is() )
-    {
-        SetPopup( TRUE );
-        SetEntries( new SvxEntries() );
-
-           uno::Sequence< beans::PropertyValue > aProps;
-        for ( sal_Int32 i = 0; i < aChildren->getCount(); i++ )
-        {
-               if ( aChildren->getByIndex( i ) >>= aProps )
-            {
-                SvxConfigEntry* pEntry =
-                    new SvxMenuConfigEntry( aProps, rCommandToLabelMap );
-                GetEntries()->push_back( pEntry );
-            }
-        }
-    }
-}
-*/
-
 SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
                                 const OUString& rCommandURL, bool bPopup, bool bParentData )
     : nId( 1 )
@@ -4695,51 +4466,6 @@ void ToolbarSaveInData::RestoreToolbar( SvxConfigEntry* pToolbar )
     }
 }
 
-void ToolbarSaveInData::ReloadToolbar( const OUString& rResourceURL )
-{
-    SvxEntries::const_iterator iter = GetEntries()->begin();
-    SvxConfigEntry* pToolbar = NULL;
-
-    for ( ; iter != GetEntries()->end(); iter++ )
-    {
-        SvxConfigEntry* pEntry = *iter;
-
-        if ( pEntry->GetCommand().equals( rResourceURL ) )
-        {
-            pToolbar = pEntry;
-            break;
-        }
-    }
-
-    if ( pToolbar != NULL )
-    {
-        delete pToolbar->GetEntries();
-
-        try
-        {
-            uno::Reference< container::XIndexAccess > xToolbarSettings;
-
-            if ( pToolbar->IsParentData() )
-            {
-                xToolbarSettings = GetParentConfigManager()->getSettings(
-                    pToolbar->GetCommand(), sal_False);
-            }
-            else
-            {
-                xToolbarSettings = GetConfigManager()->getSettings(
-                    pToolbar->GetCommand(), sal_False);
-            }
-
-            LoadToolbar( xToolbarSettings, pToolbar );
-        }
-        catch ( container::NoSuchElementException& )
-        {
-            // toolbar not found for some reason
-            // it will not appear in the toolbar list
-        }
-    }
-}
-
 bool ToolbarSaveInData::LoadToolbar(
     const uno::Reference< container::XIndexAccess >& xToolbarSettings,
     SvxConfigEntry* pParentData )
@@ -4750,7 +4476,6 @@ bool ToolbarSaveInData::LoadToolbar(
     {
         uno::Reference< container::XIndexAccess >   xSubMenu;
         OUString                aCommandURL;
-        OUString                aHelpURL;
         OUString                aLabel;
         bool                    bIsUserDefined = TRUE;
         sal_Bool                bIsVisible;
@@ -4759,7 +4484,7 @@ bool ToolbarSaveInData::LoadToolbar(
         sal_uInt16 nType( css::ui::ItemType::DEFAULT );
 
         bool bItem = GetToolbarItemData( xToolbarSettings, nIndex, aCommandURL,
-            aHelpURL, aLabel, nType, bIsVisible, nStyle, xSubMenu );
+            aLabel, nType, bIsVisible, nStyle, xSubMenu );
 
         if ( bItem )
         {
@@ -4800,7 +4525,6 @@ bool ToolbarSaveInData::LoadToolbar(
                         aLabel, aCommandURL, TRUE );
 
                     pEntry->SetUserDefined( bIsUserDefined );
-                    pEntry->SetHelpURL( aHelpURL );
                     pEntry->SetVisible( bIsVisible );
 
                     pEntries->push_back( pEntry );
@@ -4812,7 +4536,6 @@ bool ToolbarSaveInData::LoadToolbar(
                     SvxConfigEntry* pEntry = new SvxConfigEntry(
                         aLabel, aCommandURL, FALSE );
                     pEntry->SetUserDefined( bIsUserDefined );
-                    pEntry->SetHelpURL( aHelpURL );
                     pEntry->SetVisible( bIsVisible );
                     pEntry->SetStyle( nStyle );
                     pEntries->push_back( pEntry );
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 0b2489557053..743aa7009fbc 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -136,6 +136,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ListBox LB_MENUS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 64 , 22 ) ;
         Size = MAP_APPFONT ( 108 , 108 ) ;
@@ -143,6 +144,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
         Pos = MAP_APPFONT ( 192 , 22 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -151,6 +153,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MenuButton BTN_CHANGE
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
         Pos = MAP_APPFONT ( 192 , 39 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -181,6 +184,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     PushButton BTN_ADD_COMMANDS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
         Pos = MAP_APPFONT ( 192 , 67 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -189,6 +193,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MenuButton BTN_CHANGE_ENTRY
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
         Pos = MAP_APPFONT ( 192 , 84 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -197,6 +202,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ImageButton BTN_UP
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
         Pos = MAP_APPFONT ( 175 , 102 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -205,6 +211,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ImageButton BTN_DOWN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
         Pos = MAP_APPFONT ( 175 , 119 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -220,6 +227,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 64 , 188 ) ;
         Size = MAP_APPFONT ( 108 , 53 ) ;
@@ -234,6 +242,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MultiLineEdit ED_DESCRIPTION
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION";
         Pos = MAP_APPFONT ( 6 , 216 ) ;
         Size = MAP_APPFONT ( 261 , 36 ) ;
         Border = TRUE;
@@ -493,6 +502,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     Edit EDIT_MENU_NAME
     {
+        HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 93 , 12 ) ;
@@ -517,6 +527,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     ImageButton BTN_MENU_UP
     {
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP";
         Pos = MAP_APPFONT ( 102 , 80 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -524,6 +535,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     ImageButton BTN_MENU_DOWN
     {
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN";
         Pos = MAP_APPFONT ( 102 , 97 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -550,6 +562,7 @@ ModalDialog MD_MENU_ORGANISER
 // MD_NEW_TOOLBAR -------------------------------------------------
 ModalDialog MD_NEW_TOOLBAR
 {
+    HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR";
     OutputSize = TRUE ;
     SvLook = TRUE ;
     Size = MAP_APPFONT ( 165 , 63 ) ;
@@ -565,6 +578,7 @@ ModalDialog MD_NEW_TOOLBAR
     };
     Edit EDT_STRING
     {
+        HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 97 , 12 ) ;
@@ -579,6 +593,7 @@ ModalDialog MD_NEW_TOOLBAR
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 43 ) ;
         Size = MAP_APPFONT ( 97 , 53 ) ;
@@ -654,6 +669,7 @@ ModalDialog MD_ICONSELECTOR
     };
     PushButton BTN_IMPORT
     {
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT";
         Pos = MAP_APPFONT ( 184 , 7 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -662,6 +678,7 @@ ModalDialog MD_ICONSELECTOR
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE";
         Pos = MAP_APPFONT ( 184 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -691,6 +708,7 @@ ModalDialog MD_ICONSELECTOR
 //added for issue83555
 ModalDialog MD_ICONCHANGE
 {
+    HelpID = "cui:ModalDialog:MD_ICONCHANGE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 150 ) ;
@@ -714,6 +732,7 @@ ModalDialog MD_ICONCHANGE
 
     MultiLineEdit EDT_ADDR
     {
+        HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR";
         Pos = MAP_APPFONT ( 30 , 38) ;
         Size = MAP_APPFONT ( 140 , 83 ) ;
         Border = TRUE;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 952de1f9275e..da294a4526b0 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -376,40 +376,6 @@ void SfxConfigFunctionListBox_Impl::ClearAll()
     Clear();
 }
 
-SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
-/*  Beschreibung
-    Ermittelt den SvLBoxEntry zu einem "ubergebenen String. Das setzt voraus, da\s
-    die Namen eindeutig sind.
-*/
-{
-    SvLBoxEntry *pEntry = First();
-    while ( pEntry )
-    {
-        if ( GetEntryText( pEntry ) == rName )
-            return pEntry;
-        pEntry = Next( pEntry );
-    }
-
-    return NULL;
-}
-
-SvLBoxEntry* SfxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
-/*  Beschreibung
-    Ermittelt den SvLBoxEntry zu einer "ubergebenen Id.
-*/
-{
-    SvLBoxEntry *pEntry = First();
-    while ( pEntry )
-    {
-        SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData();
-        if ( pData && pData->nOrd == nId )
-            return pEntry;
-        pEntry = Next( pEntry );
-    }
-
-    return NULL;
-}
-
 SfxMacroInfo* SfxConfigFunctionListBox_Impl::GetMacroInfo()
 /*  Beschreibung
     Gibt die MacroInfo des selektierten Entry zur"uck ( sofern vorhanden ).
@@ -451,60 +417,6 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel()
     return pData->sCommand;
 }
 
-USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
-/*  Beschreibung
-    Gibt die Ordnungsnummer ( SlotId oder Macro-Nummer ) des Eintrags zur"uck.
-*/
-{
-    SfxGroupInfo_Impl *pData = pEntry ?
-        (SfxGroupInfo_Impl*) pEntry->GetUserData() : 0;
-    if ( pData )
-        return pData->nOrd;
-    return 0;
-}
-
-/*
-String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
-{
-    // Information zum selektierten Entry aus den Userdaten holen
-    SfxGroupInfo_Impl *pInfo = pEntry ? (SfxGroupInfo_Impl*) pEntry->GetUserData(): 0;
-    if ( pInfo )
-    {
-        switch ( pInfo->nKind )
-        {
-            case SFX_CFGGROUP_FUNCTION :
-            case SFX_CFGFUNCTION_SLOT :
-            {
-                // Eintrag ist eine Funktion, Hilfe aus der Office-Hilfe
-                USHORT nId = pInfo->nOrd;
-                String aText = Application::GetHelp()->GetHelpText( nId, this );
-
-                if ( !aText.Len() )
-                    aText = SFX_SLOTPOOL().GetSlotHelpText_Impl( nId );
-                return aText;
-            }
-
-            case SFX_CFGGROUP_SCRIPTCONTAINER :
-            case SFX_CFGFUNCTION_SCRIPT :
-            case SFX_CFGGROUP_BASICMGR :
-            case SFX_CFGGROUP_DOCBASICMGR :
-            case SFX_CFGGROUP_BASICLIB :
-            case SFX_CFGGROUP_BASICMOD :
-            case SFX_CFGFUNCTION_MACRO :
-            {
-                // Eintrag ist ein Macro, Hilfe aus der MacroInfo
-                SfxMacroInfo *pMacInfo = (SfxMacroInfo*) pInfo->pObject;
-                return pMacInfo->GetHelpText();
-            }
-
-            case SFX_CFGGROUP_STYLES :
-                return String();
-        }
-    }
-
-    return String();
-}*/
-
 void SfxConfigFunctionListBox_Impl::FunctionSelected()
 /*  Beschreibung
     Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten
@@ -1247,25 +1159,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
     return xModel;
 }
 
-::rtl::OUString SfxConfigGroupListBox_Impl::parseLocationName( const ::rtl::OUString& location )
-{
-    // strip out the last leaf of location name
-    // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw
-    ::rtl::OUString temp = location;
-    sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString::createFromAscii( "/" ) );
-
-    if ( ( lastSlashIndex + 1 ) <  temp.getLength()  )
-    {
-        temp = temp.copy( lastSlashIndex + 1 );
-    }
-    // maybe we should throw here!!!
-    else
-    {
-        OSL_TRACE("Something wrong with name, perhaps we should throw an exception");
-    }
-    return temp;
-}
-
 //-----------------------------------------------
 ::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand)
 {
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index e8c0e21677ac..8b19a1e79794 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -63,6 +63,7 @@ TabPage RID_SVXPAGE_EVENTS
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 238 ) ;
         Size = MAP_APPFONT ( 132 , 53 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_EVENTS
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN";
         Pos = MAP_APPFONT ( 217 , ROW0A ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -83,6 +85,7 @@ TabPage RID_SVXPAGE_EVENTS
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE";
         Pos = MAP_APPFONT ( 217 , ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index e7d70dd9d396..9b5453553ef3 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -296,6 +296,11 @@ void _SvxMacroTabPage::InitResources()
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened",  RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) );
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed",  RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) );
 //    aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished",        RID_SVXSTR_EVENT_LAYOUT_FINISHED ) );
+    aDisplayNames.push_back( EventDisplayName( "OnSelect",              RID_SVXSTR_EVENT_SELECTIONCHANGED ) );
+    aDisplayNames.push_back( EventDisplayName( "OnDoubleClick",         RID_SVXSTR_EVENT_DOUBLECLICK ) );
+    aDisplayNames.push_back( EventDisplayName( "OnRightClick",          RID_SVXSTR_EVENT_RIGHTCLICK ) );
+    aDisplayNames.push_back( EventDisplayName( "OnCalculate",           RID_SVXSTR_EVENT_CALCULATE ) );
+    aDisplayNames.push_back( EventDisplayName( "OnChange",              RID_SVXSTR_EVENT_CONTENTCHANGED ) );
 
     // the event name to UI string mappings for forms & dialogs
     //
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 26aaea2c34db..50e8498dc8e9 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -36,7 +36,7 @@
 
 TabPage RID_SVXPAGE_MACROASSIGN
 {
-     // HelpID = HID_MACROASSIGN ;
+    HelpID = "cui:TabPage:RID_SVXPAGE_MACROASSIGN" ;
     Hide = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -66,6 +66,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN";
         Pos = MAP_APPFONT ( COL4 , ROW0A  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "M~acro..." ;
@@ -74,6 +75,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_ASSIGN_COMPONENT
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT";
         Pos = MAP_APPFONT ( COL4 , ROW2  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Disable = TRUE ;
@@ -82,6 +84,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE";
         Pos = MAP_APPFONT ( COL4 , ROW5_REMOVE  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Remove" ;
@@ -112,6 +115,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
 
 ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( COMP_WIDTH , COMP_HEIGHT ) ;
@@ -144,6 +148,7 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
     };
     Edit EDIT_METHOD
     {
+        HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROWEDIT ) ;
         Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -457,3 +462,29 @@ String RID_SVXSTR_EVENT_LAYOUT_FINISHED
 {
     Text [ en-US ] = "Document layout finished" ;
 };
+
+String RID_SVXSTR_EVENT_SELECTIONCHANGED
+{
+    Text [ en-US ] = "Selection changed" ;
+};
+
+String RID_SVXSTR_EVENT_DOUBLECLICK
+{
+    Text [ en-US ] = "Double click" ;
+};
+
+String RID_SVXSTR_EVENT_RIGHTCLICK
+{
+    Text [ en-US ] = "Right click" ;
+};
+
+String RID_SVXSTR_EVENT_CALCULATE
+{
+    Text [ en-US ] = "Formulas calculated" ;
+};
+
+String RID_SVXSTR_EVENT_CONTENTCHANGED
+{
+    Text [ en-US ] = "Content changed" ;
+};
+
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3e99f3e95b5f..833dc0f32c82 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -154,42 +154,6 @@ void SvxConfigFunctionListBox_Impl::ClearAll()
     Clear();
 }
 
-SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( const String& rName )
-{
-    SvLBoxEntry *pEntry = First();
-    while ( pEntry )
-    {
-        if ( GetEntryText( pEntry ) == rName )
-            return pEntry;
-        pEntry = Next( pEntry );
-    }
-
-    return NULL;
-}
-
-SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetEntry_Impl( USHORT nId )
-{
-    SvLBoxEntry *pEntry = First();
-    while ( pEntry )
-    {
-        SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData();
-        if ( pData && pData->nOrd == nId )
-            return pEntry;
-        pEntry = Next( pEntry );
-    }
-
-    return NULL;
-}
-
-USHORT SvxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
-{
-    SvxGroupInfo_Impl *pData = pEntry ?
-        (SvxGroupInfo_Impl*) pEntry->GetUserData() : 0;
-    if ( pData )
-        return pData->nOrd;
-    return 0;
-}
-
 String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
 {
     // Information zum selektierten Entry aus den Userdaten holen
@@ -1214,12 +1178,6 @@ SvxScriptSelectorDialog::SetDialogDescription( const String& rDescription )
     aDialogDescription.SetText( rDescription );
 }
 
-USHORT
-SvxScriptSelectorDialog::GetSelectedId()
-{
-    return aCommands.GetId( aCommands.GetLastSelectedEntry() );
-}
-
 String
 SvxScriptSelectorDialog::GetScriptURL() const
 {
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 303b54688eea..4fde01da986e 100755
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -76,6 +76,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
+using ::rtl::OUString;
+
 #define C2U(cChar)                  ::rtl::OUString::createFromAscii(cChar)
 // struct SpellDialog_Impl ---------------------------------------------
 
@@ -930,7 +932,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
   -----------------------------------------------------------------------*/
 void SpellDialog::InitUserDicts()
 {
-    sal_uInt16 nLang = aLanguageLB.GetSelectLanguage();
+    const LanguageType nLang = aLanguageLB.GetSelectLanguage();
 
     const Reference< XDictionary >  *pDic = 0;
 
@@ -948,51 +950,50 @@ void SpellDialog::InitUserDicts()
         pImpl->aDics = xDicList->getDictionaries();
     }
 
-    // Benutzerbuecher anzeigen
+    SvtLinguConfig aCfg;
+    const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+
+    // list suitable dictionaries
+    bool bEnable = false;
     const sal_Int32 nSize = pImpl->aDics.getLength();
     pDic = pImpl->aDics.getConstArray();
-    sal_Int32 i;
     delete aAddToDictMB.GetPopupMenu();
     PopupMenu* pMenu = new PopupMenu;
-    for (i = 0; i < nSize; ++i )
+    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    USHORT nItemId = 1;     // menu items should be enumerated from 1 and not 0
+    for (sal_Int32 i = 0; i < nSize; ++i)
     {
-        Reference< XDictionary >  xDic( pDic[i], UNO_QUERY );
-        if (!xDic.is() || SvxGetIgnoreAllList() == xDic)
+        uno::Reference< linguistic2::XDictionary >  xDicTmp( pDic[i], uno::UNO_QUERY );
+        if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp)
             continue;
 
-        // add only active and not read-only dictionaries to list
-        // from which to choose from
-        Reference< frame::XStorable > xStor( xDic, UNO_QUERY );
-        if ( xDic->isActive()  &&  (!xStor.is() || !xStor->isReadonly()) )
+        uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY );
+        LanguageType nActLanguage = SvxLocaleToLanguage( xDicTmp->getLocale() );
+        if( xDicTmp->isActive()
+            &&  xDicTmp->getDictionaryType() != linguistic2::DictionaryType_NEGATIVE
+            && (nLang == nActLanguage || LANGUAGE_NONE == nActLanguage )
+            && (!xStor.is() || !xStor->isReadonly()) )
         {
-            sal_Bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
-            pMenu->InsertItem( (USHORT)i + 1, ::GetDicInfoStr( xDic->getName(),
-                                SvxLocaleToLanguage( xDic->getLocale() ), bNegativ ) );
-        }
-    }
-    aAddToDictMB.SetPopupMenu(pMenu);
-
-    aAddToDictMB.Disable();
+            pMenu->InsertItem( nItemId, xDicTmp->getName() );
+            bEnable = sal_True;
 
-    sal_uInt16 k;
-    for ( k = 0; k < pMenu->GetItemCount(); ++k )
-    {
-        sal_uInt16 nId = pMenu->GetItemId(k) - 1;
-        sal_Bool bFound = sal_False;
-
-        const sal_uInt16 nDicLang  = SvxLocaleToLanguage( pDic[nId]->getLocale() );
-        const sal_Bool bDicNegativ =
-            pDic[nId]->getDictionaryType() == DictionaryType_NEGATIVE;
-        // Stimmt die Sprache "uberein, dann enable
-        if ((nDicLang == nLang || nDicLang == LANGUAGE_NONE) && !bDicNegativ)
-            bFound = sal_True;
+            uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY );
+            if (xSvcInfo.is())
+            {
+                OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
+                        xSvcInfo->getImplementationName(), bHC) );
+                if (aDictionaryImageUrl.getLength() > 0)
+                {
+                    Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
+                    pMenu->SetItemImage( nItemId, aImage );
+                }
+            }
 
-        if (bFound)
-        {
-            aAddToDictMB.Enable();
-            break;
+            ++nItemId;
         }
     }
+    aAddToDictMB.SetPopupMenu(pMenu);
+    aAddToDictMB.Enable( bEnable );
 }
 /*-- 20.10.2003 15:31:06---------------------------------------------------
 
@@ -1000,31 +1001,39 @@ void SpellDialog::InitUserDicts()
 IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
 {
     aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
-    USHORT nItem = pButton->GetCurItemId();
 
     //GetErrorText() returns the current error even if the text is already
     //manually changed
-    String sNewWord= aSentenceED.GetErrorText();
+    const String aNewWord= aSentenceED.GetErrorText();
+
+    USHORT nItemId = pButton->GetCurItemId();
+    PopupMenu *pMenu = pButton->GetPopupMenu();
+    String aDicName ( pMenu->GetItemText( nItemId ) );
+
+    uno::Reference< linguistic2::XDictionary >      xDic;
+    uno::Reference< linguistic2::XDictionaryList >  xDicList( SvxGetDictionaryList() );
+    if (xDicList.is())
+        xDic = xDicList->getDictionaryByName( aDicName );
 
-    Reference< XDictionary >  xDic( pImpl->aDics.getConstArray()[ nItem - 1 ], UNO_QUERY );
     sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
     if (xDic.is())
     {
-        String sTmpTxt( sNewWord );
-        sal_Bool bNegEntry = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
-        nAddRes = linguistic::AddEntryToDic( xDic, sTmpTxt, bNegEntry,
-                ::rtl::OUString(), LANGUAGE_NONE );
+        nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, FALSE, OUString(), LANGUAGE_NONE );
+        // save modified user-dictionary if it is persistent
+        uno::Reference< frame::XStorable >  xSavDic( xDic, uno::UNO_QUERY );
+        if (xSavDic.is())
+            xSavDic->store();
 
-        if(nAddRes == DIC_ERR_NONE)
+        if (nAddRes == DIC_ERR_NONE)
         {
             SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl(
                             SPELLUNDO_CHANGE_ADD_TO_DICTIONARY, aDialogUndoLink);
-            pAction->SetDictionary(xDic);
-            pAction->SetAddedWord(sTmpTxt);
-            aSentenceED.AddUndoAction(pAction);
+            pAction->SetDictionary( xDic );
+            pAction->SetAddedWord( aNewWord );
+            aSentenceED.AddUndoAction( pAction );
         }
         // failed because there is already an entry?
-        if (DIC_ERR_NONE != nAddRes && xDic->getEntry( sTmpTxt ).is())
+        if (DIC_ERR_NONE != nAddRes && xDic->getEntry( aNewWord ).is())
             nAddRes = DIC_ERR_NONE;
     }
     if (DIC_ERR_NONE != nAddRes)
@@ -1032,8 +1041,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
         SvxDicError( this, nAddRes );
         return 0;   // Nicht weitermachen
     }
-    // nach dem Aufnehmen ggf. '='-Zeichen entfernen
-    sNewWord.EraseAllChars( sal_Unicode( '=' ) );
 
     // go on
     SpellContinue_Impl();
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 5a97025f02af..3c3c7a6be3ca 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -61,6 +61,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE";
         Pos = MAP_APPFONT( 110, 6 );
         Size = MAP_APPFONT( 93, 55 );
         Border = TRUE;
@@ -76,6 +77,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     MultiLineEdit ED_NEWWORD
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD";
         Pos = MAP_APPFONT( 6, 37 );
         Size = MAP_APPFONT( 197, 48 );
         Border = TRUE;
@@ -91,6 +93,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     ListBox LB_SUGGESTION
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION";
         Pos = MAP_APPFONT( 6, 99 );
         Size = MAP_APPFONT( 197, 48 );
         Border = TRUE;
@@ -98,6 +101,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     CheckBox CB_CHECK_GRAMMAR
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR";
         Pos = MAP_APPFONT(  6, 153 );
         Size = MAP_APPFONT( 100, 10 );
         Text [ en-US ] = "Check ~grammar" ;
@@ -106,6 +110,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_IGNORE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE";
         Pos = MAP_APPFONT( 209, 37 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Ignore Once" ;
@@ -113,12 +118,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_IGNOREALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL";
         Pos = MAP_APPFONT( 209, 54 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "I~gnore All" ;
     };
     PushButton PB_IGNORERULE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE";
         Pos = MAP_APPFONT( 209, 54 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "I~gnore Rule" ;
@@ -126,6 +133,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     MenuButton MB_ADDTODICT
     {
+        HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT";
         Pos = MAP_APPFONT( 209, 71 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Add" ;
@@ -133,6 +141,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE";
         Pos = MAP_APPFONT( 209, 99 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Change" ;
@@ -141,12 +150,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CHANGEALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL";
         Pos = MAP_APPFONT( 209, 117 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "Change A~ll" ;
     };
     PushButton PB_EXPLAIN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN";
         Pos = MAP_APPFONT( 209, 117 );
         Size = MAP_APPFONT( 55, 14 );
         Hide = TRUE;
@@ -154,6 +165,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     PushButton PB_AUTOCORR
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR";
         Pos = MAP_APPFONT( 209, 134 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "AutoCor~rect" ;
@@ -172,12 +184,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     PushButton PB_OPTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS";
         Pos = MAP_APPFONT( 87, 170 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "O~ptions..." ;
     };
     PushButton PB_UNDO
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO";
         Pos = MAP_APPFONT( 148, 170 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Undo" ;
@@ -185,6 +199,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CLOSE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE";
         Pos = MAP_APPFONT ( 209 , 170 ) ;
         Size = MAP_APPFONT ( 55 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 02e2e728f412..8d7f655b179f 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -35,10 +35,9 @@
  // RID_SVXDLG_CHARMAP ----------------------------------------------------
 ModalDialog RID_SVXDLG_CHARMAP
 {
-    HelpId = SID_CHARMAP ;
+    HelpId = CMD_SID_CHARMAP ;
     SvLook = TRUE ;
     Text [ en-US ] = "Special Characters";
-/*  Size = MAP_APPFONT ( 297 , 169 ) ; */
     Size = MAP_APPFONT ( 297 , 153 ) ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -61,6 +60,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     ListBox LB_FONT
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT";
         Pos = MAP_APPFONT ( 42 , 6 ) ;
         Size = MAP_APPFONT ( 70 , 58 ) ;
         Sort = TRUE ;
@@ -75,6 +75,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     ListBox LB_SUBSET
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET";
         Pos = MAP_APPFONT ( 161 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 68 ) ;
         Sort = FALSE ;
@@ -92,7 +93,6 @@ ModalDialog RID_SVXDLG_CHARMAP
     {
         HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
         Pos = MAP_APPFONT ( 46 , 137 ) ;
-/*      Size = MAP_APPFONT ( 190 , 16 ) ; */
         Size = MAP_APPFONT ( 244 , 16 ) ;
         Group = TRUE ;
     };
@@ -130,30 +130,11 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE";
         Pos = MAP_APPFONT ( 242 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
     };
-/*
-    PushButton BT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 242 , 140 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Assign shortcut...";
-    };
-    FixedText FT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 156 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Shortcut key: ";
-    };
-    Control CT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 60 , 156 ) ;
-        Size = MAP_APPFONT ( 160 , 8 ) ;
-    };
-*/
 };
 
 // ********************************************************************** EOF
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index f1cc2a869d6a..327ffd4cbc17 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -183,52 +183,6 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow,
         // (FirstWindow, LastWindow) was no valid control group
 }
 
-// -----------------------------------------------------------------------
-String SvxCommonLinguisticControl::GetNewEditWord()
-{
-    return aNewWordED.GetText();
-}
-
-// -----------------------------------------------------------------------
-void SvxCommonLinguisticControl::SetNewEditWord( const String& _rNew )
-{
-    aNewWordED.SetText( _rNew );
-}
-
-//-----------------------------------------------------------------------------
-void SvxCommonLinguisticControl::UpdateIgnoreHelp( )
-{
-
-    String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
-    aInfoStr.Append( GetCurrentText() );
-
-    String aString = GetNonMnemonicString( aIgnoreAllBtn.GetText() );
-    aString.Append( aInfoStr );
-    aIgnoreAllBtn.SetQuickHelpText( aString );
-
-    aString = GetNonMnemonicString( aIgnoreBtn.GetText() );
-    aString.Append( aInfoStr );
-    aIgnoreBtn.SetQuickHelpText( aString );
-}
-
-//-----------------------------------------------------------------------------
-void SvxCommonLinguisticControl::UpdateChangesHelp( const String& _rNewText )
-{
-    String aInfoStr( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
-    aInfoStr.Append( GetCurrentText() );
-    aInfoStr.Append( String( RTL_CONSTASCII_USTRINGPARAM( " -> " ) ) );
-    aInfoStr.Append( _rNewText );
-        // TODO: shouldn't this be part of the resources, for proper localization?
-
-    String aString = GetNonMnemonicString( aChangeAllBtn.GetText() );
-    aString.Append( aInfoStr );
-    aChangeAllBtn.SetQuickHelpText( aString );
-
-    aString = GetNonMnemonicString( aChangeBtn.GetText() );
-    aString.Append( aInfoStr );
-    aChangeBtn.SetQuickHelpText( aString );
-}
-
 //-----------------------------------------------------------------------------
 void SvxCommonLinguisticControl::Paint( const Rectangle& rRect )
 {
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 04d9fbcc58e4..c6eb11b9a48c 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -152,18 +152,6 @@ public:
 
     // returns the location (upper-left corner) of the group of action buttons
     inline Point    GetActionButtonsLocation( ) const { return aIgnoreBtn.GetPosPixel(); }
-
-    // updates the help texts for the "change" and "change all" buttons according to the currently
-    // entered texts
-            void UpdateChangesHelp( const String& _rNewText );
-    inline  void UpdateChangesHelp( ) { UpdateChangesHelp( GetWordInputControl().GetText() ); }
-
-    // updates the help texts for the "ignore" and "always ignore" buttons according to the currently
-    // entered texts
-            void UpdateIgnoreHelp( );
-
-    String          GetNewEditWord();
-    void            SetNewEditWord( const String& _rNew );
 };
 
 
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a205db2a28c9..4acfe2b8eec7 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -40,7 +40,6 @@
 #include <svx/gallery1.hxx>
 #include <svx/galtheme.hxx>
 #include "cuigaldlg.hxx"
-#include <svl/pickerhelper.hxx>
 #include "helpid.hrc"
 #include <unotools/syslocale.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -959,7 +958,7 @@ void TPGalleryThemeProperties::FillFilterList()
         }
      }
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     if ( aExtensions.Len() > 240 )
         aExtensions = DEFINE_CONST_UNICODE( "*.*" );
 #endif
@@ -1035,7 +1034,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
 
                 if ( xFolderPicker.is() )
                 {
-//                  svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES );
                     String  aDlgPathName( SvtPathOptions().GetGraphicPath() );
                     xFolderPicker->setDisplayDirectory(aDlgPathName);
 
@@ -1146,7 +1144,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
         if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound )
         {
             SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) );
-//          aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES );
             aDlg.EnableLink(sal_False);
             aDlg.AsLink(sal_False);
 
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index db4a3d15f4a4..94477b6ef3dc 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -107,6 +107,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     mbReadOnly      ( sal_False ),
     mbIsHTMLDoc     ( sal_False )
 {
+    SetUniqueId( HID_HYPERLINK_DIALOG );
     mbGrabFocus = sal_True;
     // insert pages
     Image aImage;
@@ -135,9 +136,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
-    // all tab pages set -> create mnemonics
-    //  CreateIconTextAutoMnemonics();  #99671# not useful, because this is not what user expects when using mnemonics on the pages
-
     // create itemset for tabpages
     mpItemSet = new SfxItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
                                SID_HYPERLINK_SETLINK );
diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index 9b60adf854ca..05475f880a3c 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -31,6 +31,7 @@
 
 ModalDialog RID_SVXDLG_IMAPURL
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Closeable = TRUE ;
@@ -46,6 +47,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     Edit EDT_URL
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -61,6 +63,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     ComboBox CBB_TARGETS
     {
+        HelpID = "cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS";
         Border = TRUE ;
         Sort = TRUE ;
         Pos = MAP_APPFONT ( 6 , 43 ) ;
@@ -78,6 +81,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -94,6 +98,7 @@ ModalDialog RID_SVXDLG_IMAPURL
 
     Edit EDT_URLDESCRIPTION
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_IMAPURL
 
     MultiLineEdit EDT_DESCRIPTION
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 122 ) ;
         Size = MAP_APPFONT ( 202 , 34 ) ;
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index e3e961880dfc..0c6c864005fd 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -49,6 +49,7 @@ ModalDialog RID_SVXDLG_NAME
     };
     Edit EDT_STRING
     {
+        HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 112 , 12 ) ;
@@ -96,6 +97,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME
     };
     Edit NTD_EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -153,6 +155,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
     };
     Edit NTD_EDT_TITLE
     {
+        HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -169,6 +172,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
     };
     MultiLineEdit NTD_EDT_DESC
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 41 ) ;
         Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ;
@@ -218,12 +222,14 @@ ModalDialog RID_SVXDLG_MESSBOX
     Moveable = TRUE ;
     PushButton BTN_1
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1";
         Pos = MAP_APPFONT ( 25 , 44 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     PushButton BTN_2
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2";
         Pos = MAP_APPFONT ( 78 , 44 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 186db5a48735..c705f42c5789 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -45,6 +45,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SEARCHFORTEXT
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT";
         Pos = MAP_APPFONT( 12, 23 );
         Size = MAP_APPFONT( 50, 10 );
         Group = TRUE;
@@ -52,12 +53,14 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SEARCHFORNULL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL";
         Pos = MAP_APPFONT( 12, 36 );
         Size = MAP_APPFONT( 207, 10 );
         Text [ en-US ] = "Field content is ~NULL";
     };
     RadioButton RB_SEARCHFORNOTNULL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL";
         Pos = MAP_APPFONT( 12, 49 );
         Size = MAP_APPFONT( 207, 10 );
         Text [ en-US ] = "Field content is not NU~LL";
@@ -86,6 +89,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM";
         Border = TRUE;
         Pos = MAP_APPFONT( 110, 76 );
         Size = MAP_APPFONT( 109, 60 );
@@ -102,6 +106,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SINGLEFIELD
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD";
         Pos = MAP_APPFONT( 24, 106 );
         Size = MAP_APPFONT( 75, 10 );
         Text [ en-US ] = "Single field";
@@ -204,6 +209,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     CheckBox CB_HALFFULLFORMS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS";
         Pos = MAP_APPFONT( 105, 209 );
         Size = MAP_APPFONT( 85, 10 );
         TabStop = TRUE ;
@@ -211,6 +217,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     CheckBox CB_SOUNDSLIKECJK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK";
         Pos = MAP_APPFONT( 190, 209 );
         Size = MAP_APPFONT( 84, 10 );
         TabStop = TRUE ;
@@ -218,6 +225,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     PushButton PB_SOUNDSLIKESETTINGS
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS";
         Pos = MAP_APPFONT( 275, 207 );
         Size = MAP_APPFONT( 14, 14 );
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index db0d4bbf3973..f8d035528c71 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -94,6 +94,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
     };
     Edit EDT_MS_NAME
     {
+        HelpID = "cui:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 10 ) ;
         Size = MAP_APPFONT ( 194 , 12 ) ;
@@ -174,6 +175,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     ComboBox CBB_FILETYPE
     {
+        HelpID = "cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE";
         Pos = MAP_APPFONT ( 57 , 6 ) ;
         Size = MAP_APPFONT ( 121 , 69 ) ;
         TabStop = TRUE ;
@@ -183,6 +185,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     MultiListBox LBX_FOUND
     {
+        HelpID = "cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 23  ) ;
         Size = MAP_APPFONT ( 172 , 156 ) ;
@@ -191,6 +194,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_SEARCH
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH";
         Pos = MAP_APPFONT ( 184 , 6  ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -198,6 +202,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_TAKE
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE";
         Pos = MAP_APPFONT ( 184 , 24  ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -205,6 +210,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_TAKEALL
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL";
         Pos = MAP_APPFONT ( 184 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -212,6 +218,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     CheckBox CBX_PREVIEW
     {
+        HelpID = "cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW";
         Pos = MAP_APPFONT ( 184 , 76  ) ;
         Size = MAP_APPFONT ( 70 , 12 ) ;
         Text [ en-US ] = "Pr~eview" ;
@@ -224,6 +231,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_MADDIN1
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN1";
         Pos = MAP_APPFONT ( 220 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -231,6 +239,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_MADDIN2
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN2";
         Pos = MAP_APPFONT ( 220 , 80 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -388,6 +397,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
 
 ModalDialog RID_SVXDLG_GALLERY_THEMEID
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID";
     OutputSize = TRUE ;
     Border = TRUE ;
     SVLook = TRUE ;
@@ -415,6 +425,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID
     };
     ListBox LB_RESNAME
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 100 , 60 ) ;
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index a94161c0a1ed..0970049622fb 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -37,7 +37,7 @@
 
 ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 {
-    HelpID = SID_GRFFILTER_MOSAIC;
+    HelpID = CMD_SID_GRFFILTER_MOSAIC;
     OutputSize = TRUE ;
     Moveable = TRUE ;
     SVLook = TRUE ;
@@ -66,6 +66,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y1   MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , MA_Y1 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -91,6 +92,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y3   MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12, MA_Y3 ) ;
         Size = MAP_APPFONT ( 35, 12 ) ;
@@ -109,6 +111,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y4   MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
     CheckBox DLG_FILTERMOSAIC_CBX_EDGES
     {
+        HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES";
         Pos = MAP_APPFONT ( 12, MA_Y4 ) ;
         Size = MAP_APPFONT ( 91, 12 ) ;
         TabStop = TRUE ;
@@ -141,7 +144,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 
 ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 {
-    HelpID = SID_GRFFILTER_SOLARIZE;
+    HelpID = CMD_SID_GRFFILTER_SOLARIZE;
     OutputSize = TRUE ;
     Moveable = TRUE ;
     SVLook = TRUE ;
@@ -170,6 +173,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 #define MA_Y6   MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , MA_Y6 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -186,6 +190,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 #define MA_Y7   MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     CheckBox DLG_FILTERSOLARIZE_CBX_INVERT
     {
+        HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT";
         Pos = MAP_APPFONT ( 12, 46 ) ;
         Size = MAP_APPFONT ( 77, 12 ) ;
         TabStop = TRUE ;
@@ -218,7 +223,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 
 ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
 {
-    HelpID = SID_GRFFILTER_SEPIA;
+    HelpID = CMD_SID_GRFFILTER_SEPIA;
     OutputSize = TRUE ;
     Moveable = TRUE ;
     SVLook = TRUE ;
@@ -247,6 +252,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
 #define MA_Y9   MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSEPIA_MTR_SEPIA
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , MA_Y9 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -290,7 +296,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
 
 ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 {
-    HelpID = SID_GRFFILTER_POSTER;
+    HelpID = CMD_SID_GRFFILTER_POSTER;
     OutputSize = TRUE ;
     Moveable = TRUE ;
     SVLook = TRUE ;
@@ -319,6 +325,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 #define MA_Y11  MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     NumericField DLG_FILTERPOSTER_NUM_POSTER
     {
+        HelpID = "cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , MA_Y11 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -359,13 +366,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 
 TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB
 {
+    HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB";
     Pos = MAP_APPFONT ( 0, 0 ) ;
     Size = MAP_APPFONT ( 0, 0 ) ;
 };
 
 ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
 {
-    HelpID = SID_GRFFILTER_EMBOSS;
+    HelpID = CMD_SID_GRFFILTER_EMBOSS;
     OutputSize = TRUE ;
     Moveable = TRUE ;
     SVLook = TRUE ;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2198a42c3fcf..32e62d3e7f80 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -690,12 +690,6 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    void HangulHanjaConversionDialog::SetOptionsHdl( const Link& _rHdl )
-    {
-        m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions, _rHdl );
-    }
-
-    //-------------------------------------------------------------------------
     void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl )
     {
         m_aFind.SetClickHdl( _rHdl );
@@ -866,11 +860,6 @@ namespace svx
     }
 
     //-------------------------------------------------------------------------
-    sal_Bool HangulHanjaConversionDialog::GetByCharacter( ) const
-    {
-        return m_aReplaceByChar.IsChecked();
-    }
-    //-------------------------------------------------------------------------
     void HangulHanjaConversionDialog::SetConversionDirectionState(
             sal_Bool _bTryBothDirections,
             HHC::ConversionDirection _ePrimaryConversionDirection )
diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 11e2fe415c38..d4736a491490 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -44,6 +44,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     PushButton PB_FIND
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND";
         Pos = MAP_APPFONT( 207, 23 );
         Size = MAP_APPFONT( 30, 14 );
 
@@ -67,6 +68,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_SIMPLE_CONVERSION
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION";
         Pos = MAP_APPFONT( 51, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -77,6 +79,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BRACKETED
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED";
         Pos = MAP_APPFONT( 114, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -85,6 +88,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_BRACKETED
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED";
         Pos = MAP_APPFONT( 177, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -93,6 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_ABOVE
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE";
         Pos = MAP_APPFONT( 51, 95 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -102,6 +107,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_BELOW
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW";
         Pos = MAP_APPFONT( 114, 95 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -111,6 +117,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_ABOVE
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE";
         Pos = MAP_APPFONT( 56, 114 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -120,6 +127,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BELOW
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW";
         Pos = MAP_APPFONT( 114, 114 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -137,6 +145,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_HANGUL_ONLY
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY";
         Pos = MAP_APPFONT( 51, 134 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -145,6 +154,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_HANJA_ONLY
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY";
         Pos = MAP_APPFONT( 114, 134 );
         Size = MAP_APPFONT( 55, 8 );
 
@@ -159,6 +169,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_REPLACE_BY_CHARACTER
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER";
         Pos = MAP_APPFONT( 241, 81 );
         Size = MAP_APPFONT( 55, 24 );
 
@@ -212,36 +223,42 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT
     };
     CheckBox CB_IGNOREPOST
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_9 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text[ en-US ] = "Ignore post-positional word";
     };
     CheckBox CB_SHOWRECENTLYFIRST
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_11 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text [ en-US ] = "Show recently used entries first";
     };
     CheckBox CB_AUTOREPLACEUNIQUE
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_12 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text [ en-US ] = "Replace all unique entries automatically";
     };
     PushButton PB_HHO_NEW
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_2 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "New...";
     };
     PushButton PB_HHO_EDIT
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_4 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "Edit...";
     };
     PushButton PB_HHO_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_6 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "Delete";
@@ -291,6 +308,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_NEWDICT
     };
     Edit ED_DICTNAME
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -340,6 +358,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     ListBox LB_BOOK
     {
+        HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK";
         Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ;
         Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ;
         DropDown = TRUE;
@@ -353,6 +372,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     ComboBox LB_ORIGINAL
     {
+        HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ;
         Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ;
         DropDown = TRUE;
@@ -366,6 +386,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_1
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -373,6 +394,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_2
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -380,6 +402,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_3
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -387,6 +410,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_4
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -401,12 +425,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     PushButton PB_HHE_NEW
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW";
         Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "New";
     };
     PushButton PB_HHE_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE";
         Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Delete";
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index dc50bd8f205d..1015063b05e3 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -173,37 +173,6 @@ void SvxHyperlinkNewDocTp::FillDlgFields ( String& /*aStrURL*/ )
 #define INTERNETSHORTCUT_URL_TAG      "URL"
 #define INTERNETSHORTCUT_ICONID_TAG   "IconIndex"
 
-void SvxHyperlinkNewDocTp::ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder )
-{
-    // Open file
-    Config aCfg( rFile );
-    aCfg.SetGroup( INTERNETSHORTCUT_ID_TAG );
-
-    // read URL
-    rURL = aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_URL_TAG) ), RTL_TEXTENCODING_ASCII_US );
-    SvtPathOptions aPathOpt;
-    rURL = aPathOpt.SubstituteVariable( rURL );
-
-    // read target
-    if ( pShowAsFolder )
-    {
-        String aTemp( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_TARGET_TAG ) ), RTL_TEXTENCODING_ASCII_US ) );
-        *pShowAsFolder = aTemp == String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_FOLDER_TAG ) );
-    }
-
-    // read image-ID
-    String aStrIconId( aCfg.ReadKey( ByteString( RTL_CONSTASCII_STRINGPARAM( INTERNETSHORTCUT_ICONID_TAG ) ), RTL_TEXTENCODING_ASCII_US ) );
-    rIconId = aStrIconId.ToInt32();
-
-    // read title
-    String aLangStr = aPathOpt.SubstituteVariable( DEFINE_CONST_UNICODE("$(vlang)") );
-    ByteString aLang( aLangStr, RTL_TEXTENCODING_UTF8 );
-    ByteString aGroup = INTERNETSHORTCUT_ID_TAG;
-    ( ( aGroup += '-' ) += aLang ) += ".W";
-    aCfg.SetGroup( aGroup );
-    rTitle = String( aCfg.ReadKey( INTERNETSHORTCUT_TITLE_TAG ), RTL_TEXTENCODING_UTF7 );
-}
-
 void SvxHyperlinkNewDocTp::FillDocumentList ()
 {
     EnterWait();
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 4ed7d1419bba..29b4b9b5951e 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -56,18 +56,21 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     RadioButton RB_LINKTYP_INTERNET
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 57, 10 );
         Text [ en-US ] = "~Web";
     };
     RadioButton RB_LINKTYP_FTP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP";
         Pos = MAP_APPFONT( 114 + COL_DIFF, 13 );
         Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
         Text [ en-US ] = "~FTP";
     };
     RadioButton RB_LINKTYP_TELNET
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET";
         Pos = MAP_APPFONT( 173, 13 );
         Size = MAP_APPFONT( 56, 10 );
         Text [ en-US ] = "~Telnet";
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_LOGIN
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -98,6 +102,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_PASSWD
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 59 ) ;
         Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -105,6 +110,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     CheckBox CBX_ANONYMOUS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS";
         Pos = MAP_APPFONT ( COL_2 , 75 ) ;
         Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ;
         TabStop = TRUE ;
@@ -112,6 +118,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ImageButton BTN_BROWSE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -131,6 +138,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ImageButton BTN_TARGET
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET";
         Pos = MAP_APPFONT ( 235, 40+2 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -162,6 +170,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -177,6 +186,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -198,6 +208,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -210,12 +221,14 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -258,12 +271,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     RadioButton RB_LINKTYP_MAIL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
         Text [ en-US ] = "~E-mail";
     };
     RadioButton RB_LINKTYP_NEWS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS";
         Pos = MAP_APPFONT( 113, 13 );
         Size = MAP_APPFONT( 56, 10 );
         Text [ en-US ] = "~News";
@@ -282,12 +297,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_SUBJECT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_ADRESSBOOK
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -321,6 +338,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -336,6 +354,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -357,6 +376,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -369,12 +389,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -422,6 +444,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ImageButton BTN_FILEOPEN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN";
         Pos = MAP_APPFONT ( 235, 14 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -453,6 +476,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_TARGET_DOC
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 52 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -471,6 +495,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ImageButton BTN_BROWSE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE";
         Pos = MAP_APPFONT ( 235, 51 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -502,6 +527,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -517,6 +543,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -538,6 +565,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -550,12 +578,14 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -597,12 +627,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     RadioButton RB_EDITNOW
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 85 - COL_DIFF, 10 );
         Text [ en-US ] = "Edit ~now";
     };
     RadioButton RB_EDITLATER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER";
         Pos = MAP_APPFONT( 142, 13 );
         Size = MAP_APPFONT( 84, 10 );
         Text [ en-US ] = "Edit ~later";
@@ -615,6 +647,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_PATH_NEWDOC
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 25 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -627,6 +660,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ListBox LB_DOCUMENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ;
@@ -635,6 +669,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ImageButton BTN_CREATE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -682,6 +718,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -703,6 +740,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -715,12 +753,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -746,7 +786,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
 *************************************************************************/
 ModalDialog RID_SVXDLG_NEWHYPERLINK
 {
-    HelpID = SID_HYPERLINK_DIALOG;
+    HelpID = CMD_SID_HYPERLINK_DIALOG;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 325 , 185 ) ;
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f10e94626f31..39a7cc6fd3d9 100755..100644
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -54,6 +54,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     Edit ED_WORD
     {
+        HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD";
         BORDER = TRUE ;
         Pos = MAP_APPFONT ( 5 , 17 ) ;
         Size = MAP_APPFONT ( 132 , 12 ) ;
@@ -62,6 +63,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT";
         Pos = MAP_APPFONT ( 56 , 33 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -69,6 +71,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     ImageButton BTN_RIGHT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT";
         Pos = MAP_APPFONT ( 75 , 33 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -84,6 +87,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_CONTINUE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE";
         Pos = MAP_APPFONT ( 144 , 35 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Skip" ;
@@ -91,6 +95,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE";
         Pos = MAP_APPFONT ( 144 , 52 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_ALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL";
         Pos = MAP_APPFONT ( 63 , 93 ) ;
         Size = MAP_APPFONT ( 74 , 14 ) ;
         Text [ en-US ] = "Hyphenate ~All" ;
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index adea20068499..a9356704e503 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -149,56 +149,6 @@ sal_Bool IconChoicePage::QueryClose()
 
 /**********************************************************************
 |
-| handling itemsets
-|
-\**********************************************************************/
-
-const SfxPoolItem* IconChoicePage::GetItem( const SfxItemSet& rSet,
-                                            USHORT nSlot )
-{
-    const SfxItemPool* pPool = rSet.GetPool();
-    USHORT nWh = pPool->GetWhich( nSlot );
-    const SfxPoolItem* pItem = 0;
-    rSet.GetItemState( nWh, TRUE, &pItem );
-
-    if ( !pItem && nWh != nSlot )
-        pItem = &pPool->GetDefaultItem( nWh );
-
-    return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-const SfxPoolItem* IconChoicePage::GetOldItem( const SfxItemSet& rSet,
-                                               USHORT nSlot )
-{
-    const SfxItemSet& rOldSet = GetItemSet();
-    USHORT nWh = GetWhich( nSlot );
-    const SfxPoolItem* pItem = 0;
-
-    if ( bStandard && rOldSet.GetParent() )
-        pItem = GetItem( *rOldSet.GetParent(), nSlot );
-    else if ( rSet.GetParent() && SFX_ITEM_DONTCARE == rSet.GetItemState( nWh ) )
-        pItem = GetItem( *rSet.GetParent(), nSlot );
-    else
-        pItem = GetItem( rOldSet, nSlot );
-
-    return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-const SfxPoolItem* IconChoicePage::GetExchangeItem( const SfxItemSet& rSet,
-                                                    USHORT nSlot )
-{
-    if ( pDialog && !pDialog->IsInOK() && pDialog->GetExampleSet() )
-        return GetItem( *pDialog->GetExampleSet(), nSlot );
-    else
-        return GetOldItem( rSet, nSlot );
-}
-
-/**********************************************************************
-|
 | window-methods
 |
 \**********************************************************************/
@@ -380,18 +330,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
         delete pData;
     }
 
-    // remove Pagelist
-/*  for ( i=0; i<maPageList.Count(); i++ )
-    {
-        IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
-
-        if ( pData->bOnDemand )
-            delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
-        delete pData->pPage;
-        delete pData;
-    }*/
-
     // remove Userdata from Icons
     for ( i=0; i<maIconCtrl.GetEntryCount(); i++)
     {
@@ -415,26 +353,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
 
 SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
                                    const Image& rChoiceIcon,
-                                   CreatePage pCreateFunc /* != 0 */,
-                                   GetPageRanges pRangesFunc /* darf 0 sein */,
-                                   BOOL bItemsOnDemand, ULONG /*nPos*/ )
-{
-    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
-                                                         pRangesFunc,
-                                                         bItemsOnDemand );
-    maPageList.Insert ( pData, LIST_APPEND );
-
-    pData->fnGetRanges = pRangesFunc;
-    pData->bOnDemand = bItemsOnDemand;
-
-    USHORT *pId = new USHORT ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon );
-    pEntry->SetUserData ( (void*) pId );
-    return pEntry;
-}
-
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
-                                   const Image& rChoiceIcon,
                                    const Image& rChoiceIconHC,
                                    CreatePage pCreateFunc /* != 0 */,
                                    GetPageRanges pRangesFunc /* darf 0 sein */,
@@ -456,65 +374,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
 
 /**********************************************************************
 |
-| remove page
-|
-\**********************************************************************/
-
-void IconChoiceDialog::RemoveTabPage( USHORT nId )
-{
-    IconChoicePageData* pData = GetPageData ( nId );
-
-    // remove page from list
-    if ( pData )
-    {
-        maPageList.Remove ( pData );
-
-        // save settings
-        if ( pData->pPage )
-        {
-            pData->pPage->FillUserData();
-            String aPageData(pData->pPage->GetUserData());
-            if ( aPageData.Len() )
-            {
-                SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) );
-
-                SetViewOptUserItem( aTabPageOpt, aPageData );
-            }
-        }
-
-        if ( pData->bOnDemand )
-            delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
-        delete pData->pPage;
-        delete pData;
-    }
-
-    // remove Icon
-    BOOL bFound=FALSE;
-    for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++)
-    {
-        SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
-        USHORT* pUserData = (USHORT*) pEntry->GetUserData();
-
-        if ( *pUserData == nId )
-        {
-            delete pUserData;
-            maIconCtrl.RemoveEntry ( pEntry );
-            bFound = TRUE;
-        }
-    }
-
-    // was it the current page ?
-    if ( nId == mnCurrentPageId )
-    {
-        mnCurrentPageId = maPageList.First()->nId;
-    }
-
-    Invalidate ();
-}
-
-/**********************************************************************
-|
 | Paint-method
 |
 \**********************************************************************/
@@ -572,13 +431,6 @@ EIconChoicePos IconChoiceDialog::SetCtrlPos( const EIconChoicePos& rPos )
     return eOldPos;
 }
 
-void IconChoiceDialog::SetCtrlColor ( const Color& rColor )
-{
-    Wallpaper aWallpaper ( rColor );
-    maIconCtrl.SetBackground( aWallpaper );
-    maIconCtrl.SetFontColorToBackground ();
-}
-
 /**********************************************************************
 |
 | Show / Hide page or button
@@ -601,14 +453,6 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
 
 // -----------------------------------------------------------------------
 
-void IconChoiceDialog::RemoveResetButton()
-{
-    aResetBtn.Hide();
-    bHideResetBtn = TRUE;
-}
-
-// -----------------------------------------------------------------------
-
 void IconChoiceDialog::ShowPage( USHORT nId )
 {
     bool bInvalidate = GetCurPageId() != nId;
@@ -1144,40 +988,6 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
 
 // -----------------------------------------------------------------------
 
-//  Liefert die Pages, die ihre Sets onDemand liefern, das OutputItemSet.
-const SfxItemSet* IconChoiceDialog::GetOutputItemSet ( USHORT nId )
-{
-    IconChoicePageData * pData = GetPageData ( nId );
-    DBG_ASSERT( pData, "TabPage nicht gefunden" );
-
-    if ( pData )
-    {
-        if ( !pData->pPage )
-            return NULL;
-
-        if ( pData->bOnDemand )
-            return &pData->pPage->GetItemSet();
-
-        return pOutSet;
-    }
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-int IconChoiceDialog::FillOutputItemSet()
-{
-    int nRet = IconChoicePage::LEAVE_PAGE;
-    if ( OK_Impl() )
-        Ok();
-    else
-        nRet = IconChoicePage::KEEP_PAGE;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
 void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ )
 {
     // not interested in
@@ -1404,13 +1214,6 @@ short IconChoiceDialog::Ok()
 
 // -----------------------------------------------------------------------
 
-BOOL IconChoiceDialog::IsInOK() const
-{
-    return bInOK;
-}
-
-// -----------------------------------------------------------------------
-
 void IconChoiceDialog::FocusOnIcon( USHORT nId )
 {
     // set focus to icon for the current visible page
@@ -1426,10 +1229,3 @@ void IconChoiceDialog::FocusOnIcon( USHORT nId )
         }
     }
 }
-
-// -----------------------------------------------------------------------
-
-void IconChoiceDialog::CreateIconTextAutoMnemonics( void )
-{
-    maIconCtrl.CreateAutoMnemonics();
-}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index c45dfeb9dc06..8cf21129f52c 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -196,11 +196,6 @@ void SvInsertOleDlg::SelectDefault()
     aLbObjecttype.SelectEntryPos( 0 );
 }
 
-void SvInsertOleDlg::FillObjectServerList( SvObjectServerList* pList )
-{
-    pList->FillInsertObjects();
-}
-
 // -----------------------------------------------------------------------
 SvInsertOleDlg::SvInsertOleDlg
 (
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 41d603c81802..4929c45b93e8 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -44,7 +44,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
     return static_cast< sal_uInt16 >( aCountEdit.GetValue() );
 }
 
-SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
+SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId )
     : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ),
     aCount( this, CUI_RES( FT_COUNT ) ),
     aCountEdit( this, CUI_RES( ED_COUNT ) ),
@@ -70,7 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
         aTmp += aRow;
     }
     SetText( aTmp );
-    SetHelpId( nHelpId );
+    SetHelpId( sHelpId );
 }
 
 short SvxInsRowColDlg::Execute(void)
diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src
index 69f934a29049..f655620bcd54 100644
--- a/cui/source/dialogs/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -31,6 +31,7 @@
 
 ModalDialog DLG_INS_ROW_COL
 {
+    HelpID = "cui:ModalDialog:DLG_INS_ROW_COL";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 136 , 84 ) ;
@@ -57,6 +58,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     RadioButton CB_POS_BEFORE
     {
+        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE";
         Pos = MAP_APPFONT ( 12 , 49 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         Text [ en-US ] = "~Before" ;
@@ -64,6 +66,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     RadioButton CB_POS_AFTER
     {
+        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER";
         Pos = MAP_APPFONT ( 12 , 62 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         Text [ en-US ] = "A~fter" ;
@@ -72,6 +75,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     NumericField ED_COUNT
     {
+        HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 44 , 14 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk
index 0c5b90aff202..12239a1ac781 100644
--- a/cui/source/dialogs/makefile.mk
+++ b/cui/source/dialogs/makefile.mk
@@ -57,6 +57,7 @@ SRC1FILES =  \
         insrc.src \
         multipat.src \
         newtabledlg.src \
+        passwdomdlg.src \
         postdlg.src \
         scriptdlg.src \
         sdrcelldlg.src \
@@ -95,6 +96,7 @@ SLOFILES+=\
         $(SLO)$/multifil.obj \
         $(SLO)$/multipat.obj \
         $(SLO)$/newtabledlg.obj \
+        $(SLO)$/passwdomdlg.obj \
         $(SLO)$/pastedlg.obj \
         $(SLO)$/plfilter.obj \
         $(SLO)$/postdlg.obj \
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 987867492e13..c16c13b9ed7f 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -47,6 +47,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
     };
     ListBox LB_MULTIPATH
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 189 , 80 ) ;
@@ -70,12 +71,14 @@ ModalDialog RID_SVXDLG_MULTIPATH
     };
     PushButton BTN_ADD_MULTIPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH";
         Pos = MAP_APPFONT ( 204 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
     };
     PushButton BTN_DEL_MULTIPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH";
         Pos = MAP_APPFONT ( 204 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index 4bbbd564edd1..f9d3db8c5f0c 100644
--- a/cui/source/dialogs/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog RID_SVX_NEWTABLE_DLG
 {
+    HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -44,6 +45,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
     };
     NumericField NF_COLUMNS
     {
+        HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 6 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -63,6 +65,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
     };
     NumericField NF_ROWS
     {
+        HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 6+15 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
new file mode 100644
index 000000000000..5b768c756654
--- /dev/null
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -0,0 +1,343 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_cui.hxx"
+
+// include ---------------------------------------------------------------
+
+#include "passwdomdlg.hrc"
+#include "passwdomdlg.hxx"
+
+#include "cuires.hrc"
+#include "dialmgr.hxx"
+
+#include <sfx2/tabdlg.hxx>
+#include <tools/debug.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/button.hxx>
+#include <vcl/morebtn.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/msgbox.hxx>
+
+
+//////////////////////////////////////////////////////////////////////
+
+class PasswordReenterEdit_Impl : public Edit
+{
+    String  m_aDefaultTxt;
+
+    // disallow use of copy c-tor and assignment operator
+    PasswordReenterEdit_Impl( const PasswordReenterEdit_Impl & );
+    PasswordReenterEdit_Impl & operator = ( const PasswordReenterEdit_Impl & );
+
+public:
+    PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId );
+    virtual ~PasswordReenterEdit_Impl();
+
+    // Edit
+    virtual void        Paint( const Rectangle& rRect );
+};
+
+
+PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) :
+    Edit( pParent, rResId )
+{
+// currently the spec does not want to display this text anymore...
+//    m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) );
+}
+
+
+PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl()
+{
+}
+
+
+void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect )
+{
+    if (GetText().Len() == 0)
+    {
+        Push( /*PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR |*/ PUSH_TEXTCOLOR );
+/*
+        Color aFillColor( GetParent()->GetBackground().GetColor() );
+        SetLineColor(); // don't draw a border when painting the Edit field rectangle with the new background color
+        SetFillColor( aFillColor );
+        SetTextFillColor( aFillColor );
+        SetTextColor( GetParent()->GetTextColor() );    // use plain text color even if the Edit field is disabled (it is hard to read the text otherwise)
+
+        DrawRect( Rectangle( Point(), GetOutputSizePixel() ) );
+*/
+        SetTextColor( Color( COL_GRAY ) );
+        DrawText( Point(), m_aDefaultTxt );
+
+        Pop();
+    }
+    else
+        Edit::Paint( rRect );
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+struct PasswordToOpenModifyDialog_Impl
+{
+    PasswordToOpenModifyDialog *    m_pParent;
+
+    FixedLine                   m_aFileEncryptionFL;
+    FixedText                   m_aPasswdToOpenFT;
+    Edit                        m_aPasswdToOpenED;
+    FixedText                   m_aReenterPasswdToOpenFT;
+    PasswordReenterEdit_Impl    m_aReenterPasswdToOpenED;
+//    FixedImage                  m_aPasswdToOpenMatchFI;
+    FixedText                   m_aPasswdNoteFT;
+    FixedLine                   m_aButtonsFL;
+    MoreButton                  m_aMoreFewerOptionsBTN;
+    OKButton                    m_aOk;
+    CancelButton                m_aCancel;
+    FixedLine                   m_aFileSharingOptionsFL;
+    CheckBox                    m_aOpenReadonlyCB;
+    FixedText                   m_aPasswdToModifyFT;
+    Edit                        m_aPasswdToModifyED;
+    FixedText                   m_aReenterPasswdToModifyFT;
+    PasswordReenterEdit_Impl    m_aReenterPasswdToModifyED;
+//    FixedImage                  m_aPasswdToModifyMatchFI;
+
+    String                      m_aOneMismatch;
+    String                      m_aTwoMismatch;
+    String                      m_aInvalidStateForOkButton;
+    String                      m_aInvalidStateForOkButton_v2;
+
+    bool                        m_bIsPasswordToModify;
+
+
+//    DECL_LINK( ModifyHdl, Edit * );
+    DECL_LINK( OkBtnClickHdl, OKButton * );
+
+    PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
+            sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
+    ~PasswordToOpenModifyDialog_Impl();
+};
+
+
+PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
+        PasswordToOpenModifyDialog * pParent,
+        sal_uInt16 nMinPasswdLen,
+        sal_uInt16 nMaxPasswdLen,
+        bool bIsPasswordToModify ) :
+    m_pParent( pParent ),
+    m_aFileEncryptionFL         ( pParent, CUI_RES( FL_FILE_ENCRYPTION ) ),
+    m_aPasswdToOpenFT           ( pParent, CUI_RES( FT_PASSWD_TO_OPEN ) ),
+    m_aPasswdToOpenED           ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ),
+    m_aReenterPasswdToOpenFT    ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ),
+    m_aReenterPasswdToOpenED    ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ),
+//    m_aPasswdToOpenMatchFI      ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ),
+    m_aPasswdNoteFT             ( pParent, CUI_RES( FT_PASSWD_NOTE ) ),
+    m_aButtonsFL                ( pParent, CUI_RES( FL_BUTTONS ) ),
+    m_aMoreFewerOptionsBTN      ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ),
+    m_aOk                       ( pParent, CUI_RES( BTN_OK ) ),
+    m_aCancel                   ( pParent, CUI_RES( BTN_CANCEL ) ),
+    m_aFileSharingOptionsFL     ( pParent, CUI_RES( FL_FILE_SHARING_OPTIONS ) ),
+    m_aOpenReadonlyCB           ( pParent, CUI_RES( CB_OPEN_READONLY ) ),
+    m_aPasswdToModifyFT         ( pParent, CUI_RES( FT_PASSWD_TO_MODIFY ) ),
+    m_aPasswdToModifyED         ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ),
+    m_aReenterPasswdToModifyFT  ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ),
+    m_aReenterPasswdToModifyED  ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ),
+//    m_aPasswdToModifyMatchFI    ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) )
+    m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ),
+    m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ),
+    m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ),
+    m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ),
+    m_bIsPasswordToModify( bIsPasswordToModify )
+{
+/*
+    const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
+    const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) );
+    m_aPasswdToOpenMatchFI.SetImage( aImage );
+    m_aPasswdToModifyMatchFI.SetImage( aImage );
+*/
+
+    m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) );
+    m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) );
+
+#if 0
+    Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl );
+    m_aPasswdToOpenED.SetModifyHdl( aModifyLink );
+    m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink );
+    m_aPasswdToModifyED.SetModifyHdl( aModifyLink );
+    m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink );
+#endif
+
+    m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) );
+
+//    m_aOk.Enable( FALSE );
+
+    if (nMaxPasswdLen)
+    {
+        m_aPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen );
+        m_aReenterPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen );
+        m_aPasswdToModifyED.SetMaxTextLen( nMaxPasswdLen );
+        m_aReenterPasswdToModifyED.SetMaxTextLen( nMaxPasswdLen );
+    }
+
+    (void) nMinPasswdLen;   // currently not supported
+
+    m_aPasswdToOpenED.GrabFocus();
+
+//    ModifyHdl( NULL );
+
+    m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify );
+    if (!bIsPasswordToModify)
+        m_aMoreFewerOptionsBTN.Hide( TRUE );
+}
+
+
+PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl()
+{
+}
+
+#if 0
+IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ )
+{
+    // force repaints to get the m_aDefaultTxt displayed again
+    if (m_aReenterPasswdToOpenED.GetText().Len() == 0)
+        m_aReenterPasswdToOpenED.Invalidate();
+    if (m_aReenterPasswdToModifyED.GetText().Len() == 0)
+        m_aReenterPasswdToModifyED.Invalidate();
+
+    const sal_Int32 nPasswdToOpenLen    = m_aPasswdToOpenED.GetText().Len();
+    const sal_Int32 nPasswdToModifyLen  = m_aPasswdToModifyED.GetText().Len();
+
+    const bool bBothEmpty       = nPasswdToOpenLen == 0 && nPasswdToModifyLen == 0;
+    const bool bToOpenMatch     = m_aPasswdToOpenED.GetText()   == m_aReenterPasswdToOpenED.GetText();
+    const bool bToModifyMatch   = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText();
+
+    m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty );
+
+//    m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty );
+//    m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty );
+
+    return 0;
+}
+#endif
+
+
+IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
+{
+    bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() &&
+            m_aPasswdToOpenED.GetText().Len() == 0 &&
+            m_aPasswdToModifyED.GetText().Len() == 0;
+    if (bInvalidState)
+    {
+        ErrorBox aErrorBox( m_pParent, WB_OK,
+            m_bIsPasswordToModify? m_aInvalidStateForOkButton : m_aInvalidStateForOkButton_v2 );
+        aErrorBox.Execute();
+    }
+    else // check for mismatched passwords...
+    {
+        const bool bToOpenMatch     = m_aPasswdToOpenED.GetText()   == m_aReenterPasswdToOpenED.GetText();
+        const bool bToModifyMatch   = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText();
+        const int nMismatch = (bToOpenMatch? 0 : 1) + (bToModifyMatch? 0 : 1);
+        if (nMismatch > 0)
+        {
+            ErrorBox aErrorBox( m_pParent, WB_OK, nMismatch == 1 ? m_aOneMismatch : m_aTwoMismatch );
+            aErrorBox.Execute();
+
+            Edit &rEdit = !bToOpenMatch? m_aPasswdToOpenED : m_aPasswdToModifyED;
+            PasswordReenterEdit_Impl &rRepeatEdit = !bToOpenMatch? m_aReenterPasswdToOpenED : m_aReenterPasswdToModifyED;
+            String aEmpty;
+            if (nMismatch == 1)
+            {
+                rEdit.SetText( aEmpty );
+                rRepeatEdit.SetText( aEmpty );
+            }
+            else if (nMismatch == 2)
+            {
+                m_aPasswdToOpenED.SetText( aEmpty );
+                m_aReenterPasswdToOpenED.SetText( aEmpty );
+                m_aPasswdToModifyED.SetText( aEmpty );
+                m_aReenterPasswdToModifyED.SetText( aEmpty );
+            }
+            rEdit.GrabFocus();
+        }
+        else
+        {
+            m_pParent->EndDialog( RET_OK );
+        }
+    }
+
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+
+PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
+        Window * pParent,
+        sal_uInt16 nMinPasswdLen,
+        sal_uInt16 nMaxPasswdLen,
+        bool bIsPasswordToModify ) :
+    SfxModalDialog( pParent, CUI_RES( RID_DLG_PASSWORD_TO_OPEN_MODIFY ) )
+{
+    m_pImpl = std::auto_ptr< PasswordToOpenModifyDialog_Impl >(
+            new PasswordToOpenModifyDialog_Impl( this, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) );
+
+    FreeResource();
+}
+
+
+PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
+{
+}
+
+
+String PasswordToOpenModifyDialog::GetPasswordToOpen() const
+{
+    const bool bPasswdOk =
+            m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 &&
+            m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText();
+    return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String();
+}
+
+
+String PasswordToOpenModifyDialog::GetPasswordToModify() const
+{
+    const bool bPasswdOk =
+            m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 &&
+            m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText();
+    return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String();
+}
+
+
+bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const
+{
+    return m_pImpl->m_aOpenReadonlyCB.IsChecked();
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc
new file mode 100644
index 000000000000..522e4edf1da2
--- /dev/null
+++ b/cui/source/dialogs/passwdomdlg.hrc
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _CUI_PASSWDOMDLG_HRC_
+#define _CUI_PASSWDOMDLG_HRC_
+
+#define FL_FILE_ENCRYPTION              10
+#define FT_PASSWD_TO_OPEN               11
+#define ED_PASSWD_TO_OPEN               12
+#define FT_REENTER_PASSWD_TO_OPEN       13
+#define ED_REENTER_PASSWD_TO_OPEN       14
+#define IMG_PASSWD_MATCH                15
+#define IMG_PASSWD_MATCH_HC             16
+#define FT_PASSWD_NOTE                  17
+#define FL_BUTTONS                      18
+#define BTN_MORE_FEWER_OPTIONS          19
+#define BTN_OK                          20
+#define BTN_CANCEL                      21
+#define FL_FILE_SHARING_OPTIONS         22
+#define FT_PASSWD_TO_MODIFY             23
+#define ED_PASSWD_TO_MODIFY             24
+#define FT_REENTER_PASSWD_TO_MODIFY     25
+#define ED_REENTER_PASSWD_TO_MODIFY     26
+#define FI_PASSWD_TO_OPEN_MATCH         27
+#define FI_PASSWD_TO_MODIFY_MATCH       28
+#define CB_OPEN_READONLY                29
+
+#define STR_MORE_OPTIONS                    51
+#define STR_FEWER_OPTIONS                   52
+#define STR_PASSWD_MUST_BE_CONFIRMED        53
+#define STR_ONE_PASSWORD_MISMATCH           54
+#define STR_TWO_PASSWORDS_MISMATCH          55
+#define STR_INVALID_STATE_FOR_OK_BUTTON     56
+#define STR_INVALID_STATE_FOR_OK_BUTTON_V2  57
+
+#endif
+
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
new file mode 100644
index 000000000000..edb84813d387
--- /dev/null
+++ b/cui/source/dialogs/passwdomdlg.src
@@ -0,0 +1,228 @@
+/*************************************************************************
+ *
+ * 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 <cuires.hrc>
+#include "passwdomdlg.hrc"
+#include "helpid.hrc"
+
+
+ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
+{
+    Size = MAP_APPFONT( 171, 150 );
+    Text [ en-US ] = "Set Password";
+    HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY;
+    Border = TRUE ;
+    Moveable = TRUE ;
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+
+    FixedLine FL_FILE_ENCRYPTION
+    {
+        Pos = MAP_APPFONT( 3, 3 );
+        Size = MAP_APPFONT( 165, 8 );
+        Text [ en-US ] = "File encryption password";
+    };
+
+    FixedText FT_PASSWD_TO_OPEN
+    {
+        Pos = MAP_APPFONT( 6, 17 );
+        Size = MAP_APPFONT( 159, 8 );
+        Text [ en-US ] = "~Enter password to open";
+        WordBreak = TRUE;
+    };
+
+    Edit ED_PASSWD_TO_OPEN
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN;
+        Pos = MAP_APPFONT( 6, 28 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
+    };
+
+    FixedText FT_REENTER_PASSWD_TO_OPEN
+    {
+        Pos = MAP_APPFONT( 6, 45 );
+        Size = MAP_APPFONT( 159, 8 );
+        Text [ en-US ] = "Confirm password";
+        WordBreak = TRUE;
+    };
+
+    Edit ED_REENTER_PASSWD_TO_OPEN
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN;
+        Pos = MAP_APPFONT( 6, 56 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
+    };
+/*
+    FixedImage FI_PASSWD_TO_OPEN_MATCH
+    {
+        Pos = MAP_APPFONT ( 150, 42 ) ;
+        Size = MAP_APPFONT ( 12 , 12 ) ;
+    };
+*/
+    FixedText FT_PASSWD_NOTE
+    {
+        Pos = MAP_APPFONT( 6, 80 );
+        Size = MAP_APPFONT( 159, 4*8 );     // some extra space for translation in other languages
+        Text [ en-US ] = "Note: After a password has been set, the document will only open with "\
+                "the password. Should you lose the password, there will be no way to "\
+                "recover the document. Please also note that this password is case-sensitive.";
+        WordBreak = TRUE;
+    };
+
+    FixedLine FL_BUTTONS
+    {
+        Pos = MAP_APPFONT( 0, 117 );
+        Size = MAP_APPFONT( 171, 8 );
+    };
+
+    MoreButton BTN_MORE_FEWER_OPTIONS
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE;
+        Pos = MAP_APPFONT( 6 , 130 ) ;
+        Size = MAP_APPFONT( 50 , 14 ) ;
+        Delta = 92 ;
+        MapUnit = MAP_APPFONT ;
+        State = FALSE ;
+    };
+
+    OKButton BTN_OK
+    {
+        Pos = MAP_APPFONT( 62, 130 );
+        Size = MAP_APPFONT( 50, 14 );
+        DefButton = TRUE ;
+    };
+
+    CancelButton BTN_CANCEL
+    {
+        Pos = MAP_APPFONT( 115, 130 );
+        Size = MAP_APPFONT( 50, 14 );
+    };
+
+    FixedLine FL_FILE_SHARING_OPTIONS
+    {
+        Pos = MAP_APPFONT( 3, 154 );
+        Size = MAP_APPFONT( 165, 8 );
+        Text [ en-US ] = "File sharing password";
+    };
+
+    CheckBox CB_OPEN_READONLY
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY;
+        Pos = MAP_APPFONT( 6, 170 );
+        Size = MAP_APPFONT( 159, 8 );
+
+        Text [ en-US ] = "Open file read-only";
+    };
+
+    FixedText FT_PASSWD_TO_MODIFY
+    {
+        Pos = MAP_APPFONT( 6, 186 );
+        Size = MAP_APPFONT( 159, 8 );
+        Text [ en-US ] = "Enter password to allow editing";
+        WordBreak = TRUE;
+    };
+
+    Edit ED_PASSWD_TO_MODIFY
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY;
+        Pos = MAP_APPFONT( 6, 196 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
+    };
+
+    FixedText FT_REENTER_PASSWD_TO_MODIFY
+    {
+        Pos = MAP_APPFONT( 6, 214 );
+        Size = MAP_APPFONT( 159, 8 );
+        Text [ en-US ] = "Confirm password";
+        WordBreak = TRUE;
+    };
+
+    Edit ED_REENTER_PASSWD_TO_MODIFY
+    {
+        HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY;
+        Pos = MAP_APPFONT( 6, 224 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
+    };
+/*
+    FixedImage FI_PASSWD_TO_MODIFY_MATCH
+    {
+        Pos = MAP_APPFONT ( 150, 224 ) ;
+        Size = MAP_APPFONT ( 12 , 12 ) ;
+    };
+*/
+
+    String STR_PASSWD_MUST_BE_CONFIRMED
+    {
+        Text [ en-US ] = "Password must be confirmed" ;
+    };
+
+    String STR_MORE_OPTIONS
+    {
+        Text [ en-US ] = "More ~Options" ;
+    };
+
+    String STR_FEWER_OPTIONS
+    {
+        Text [ en-US ] = "Fewer ~Options" ;
+    };
+
+    String STR_ONE_PASSWORD_MISMATCH
+    {
+        Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
+    };
+
+    String STR_TWO_PASSWORDS_MISMATCH
+    {
+        Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ;
+    };
+
+    String STR_INVALID_STATE_FOR_OK_BUTTON
+    {
+        Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
+    };
+/*
+    Image IMG_PASSWD_MATCH
+    {
+        ImageBitmap = Bitmap { File = "apply.png"; };
+    };
+
+    Image IMG_PASSWD_MATCH_HC
+    {
+        ImageBitmap = Bitmap { File = "apply_h.png"; };
+    };
+*/
+};
+
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 904319d45355..50daaedd58b8 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -27,12 +27,13 @@
  // include ---------------------------------------------------------------
 #include <cuires.hrc>
 #include "postdlg.hrc"
+#include "helpid.hrc"
 #include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT
 
  // RID_SVXDLG_POSTIT -----------------------------------------------------
 ModalDialog RID_SVXDLG_POSTIT
 {
-    HelpId = SID_POSTIT ;
+    HelpId = HID_POSTIT_DIALOG ;
     OutputSize = TRUE ;
     SvLook = TRUE ;
     Size = MAP_APPFONT ( 198 , 134 ) ;
@@ -60,6 +61,7 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     MultiLineEdit ED_EDIT
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 38 ) ;
         Size = MAP_APPFONT ( 123 , 72 ) ;
@@ -92,12 +94,14 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     ImageButton BTN_PREV
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV";
         Pos = MAP_APPFONT ( 141 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_LEFT ;
     };
     ImageButton BTN_NEXT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT";
         Pos = MAP_APPFONT ( 167 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_RIGHT ;
@@ -110,6 +114,7 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     PushButton BTN_AUTHOR
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR";
         Pos = MAP_APPFONT ( 75 , 114 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Author" ;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index e1763249479c..62ec77c3c26a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -367,15 +367,6 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
     }
 }
 
-void SFTreeListBox::UpdateEntries()
-{
-}
-
-SvLBoxEntry* SFTreeListBox::FindEntry( SvLBoxEntry* , const String& , BYTE  )
-{
-    return 0;
-}
-
 long SFTreeListBox::ExpandingHdl()
 {
     return TRUE;
@@ -626,10 +617,6 @@ short SvxScriptOrgDialog::Execute()
     return nRet;
 }
 
-void SvxScriptOrgDialog::EnableButton( Button& , BOOL  )
-{
-}
-
 void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
 {
     if ( node.is() )
@@ -921,38 +908,6 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
     return model;
 }
 
-Reference< XInterface  >
-SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
-{
-    Reference< XInterface > xModel;
-    Reference< lang::XMultiComponentFactory > mcf =
-            xCtx->getServiceManager();
-    Reference< frame::XDesktop > desktop (
-        mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ),
-            UNO_QUERY );
-
-    Reference< container::XEnumerationAccess > componentsAccess =
-        desktop->getComponents();
-    Reference< container::XEnumeration > components =
-        componentsAccess->createEnumeration();
-    while (components->hasMoreElements())
-    {
-        Reference< frame::XModel > model(
-            components->nextElement(), UNO_QUERY );
-        if ( model.is() )
-        {
-            ::rtl::OUString sTdocUrl = ::comphelper::DocumentInfo::getDocumentTitle( model );
-            if( sTdocUrl.equals( docName ) )
-            {
-                xModel = model;
-                break;
-            }
-        }
-    }
-    return xModel;
-}
-
 void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
 {
 
@@ -1371,28 +1326,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
     aScriptsBox.SetCurEntry( pEntry );
 }
 
-BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
-    Reference< browse::XBrowseNode > node2 )
-{
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
-    if( node1->getName().equals( userStr ) )
-        return true;
-    if( node2->getName().equals( userStr ) )
-        return false;
-    if( node1->getName().equals( shareStr ) )
-        return true;
-    if( node2->getName().equals( shareStr ) )
-        return false;
-    return dialogSort2( node1, node2 );
-}
-
-BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
-    Reference< browse::XBrowseNode > node2 )
-{
-    return ( node1->getName().compareTo( node2->getName() ) < 0 );
-}
-
 ::rtl::OUString ReplaceString(
     const ::rtl::OUString& source,
     const ::rtl::OUString& token,
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 67a81376d662..bb691045dd21 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -106,6 +106,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 
     PushButton SF_PB_RUN
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         DefButton = TRUE;
@@ -121,6 +122,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 
     PushButton SF_PB_CREATE
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE";
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Pos = MAP_APPFONT ( 144 , 60 ) ;
         Text [ en-US ] = "~Create..." ;
@@ -128,6 +130,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
     };
     PushButton SF_PB_EDIT
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT";
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Pos = MAP_APPFONT ( 144 , 77 ) ;
         Text [ en-US ] = "~Edit" ;
@@ -135,12 +138,14 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
     };
     PushButton SF_PB_RENAME
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME";
         Pos = MAP_APPFONT ( 144 , 94 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Rename..." ;
     };
     PushButton SF_PB_DEL
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL";
         Pos = MAP_APPFONT ( 144 , 114 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -156,6 +161,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 };
 ModalDialog RID_DLG_NEWLIB
 {
+    HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
     Text [ en-US ] = "Create Library" ;
     Size = MAP_APPFONT ( 160 , 50 ) ;
     Moveable = TRUE ;
@@ -182,6 +188,7 @@ ModalDialog RID_DLG_NEWLIB
     };
     Edit ED_LIBNAME
     {
+        HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 59 ) ;
         Size = MAP_APPFONT ( 92 , 12 ) ;
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index 465591e8f0a0..231c32effd7a 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -29,6 +29,7 @@
 
 ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 {
+    HelpID = "cui:ModalDialog:RID_SVX_DLG_SHOWGRIDCOLUMNS";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 200, 117 );
@@ -45,6 +46,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 
     ListBox 1
     {
+        HelpID = "cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1";
         Border = TRUE;
         Pos = MAP_APPFONT( 6, 39 );
         Size = MAP_APPFONT( 188, 55 );
diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 5326ca2d0e4d..9f07dc55ac38 100644
--- a/cui/source/dialogs/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog RID_SVX_SPLITCELLDLG
 {
+    HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 169 , 108 ) ;
@@ -64,6 +65,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     NumericField ED_COUNT
     {
+        HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 14 ) ;
         Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -85,6 +87,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     ImageRadioButton RB_HORZ
     {
+        HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ";
         Pos = MAP_APPFONT ( 12 , 47 ) ;
         Size = MAP_APPFONT ( 90 , 18 ) ;
         Group = TRUE;
@@ -98,6 +101,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     CheckBox CB_PROP
     {
+        HelpID = "cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP";
         Pos = MAP_APPFONT ( 18 , 68 ) ;
         Size = MAP_APPFONT ( 91 , 12 ) ;
         Text [ en-US ] = "~Into equal proportions";
@@ -112,6 +116,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
         };
     ImageRadioButton RB_VERT
     {
+        HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 90 , 18 ) ;
         Text [ en-US ] = "~Vertically" ;
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 04265a6d6726..8131b4e68a81 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -148,6 +148,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_OTHER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER";
         Pos = MAP_APPFONT ( 86 , 14 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -169,6 +170,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_LONGER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER";
         Pos = MAP_APPFONT ( 86 , 28 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -190,6 +192,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_SHORTER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER";
         Pos = MAP_APPFONT ( 86 , 44 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +208,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     CheckBox CB_RELAX
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX";
         Pos = MAP_APPFONT ( 12 , 60 ) ;
         Size = MAP_APPFONT ( 98 , 10 ) ;
         Text [ en-US ] = "~Combine" ;
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 74a8eae82274..3f737c10dcc8 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog MD_PASTE_OBJECT
 {
+    HelpID = "cui:ModalDialog:MD_PASTE_OBJECT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -49,6 +50,7 @@ ModalDialog MD_PASTE_OBJECT
     };
     RadioButton RB_PASTE
     {
+        HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -57,6 +59,7 @@ ModalDialog MD_PASTE_OBJECT
     };
     RadioButton RB_PASTE_LINK
     {
+        HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 78 , 48 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -64,12 +67,14 @@ ModalDialog MD_PASTE_OBJECT
     };
     ListBox LB_INSERT_LIST
     {
+        HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 49 ) ;
         Size = MAP_APPFONT ( 202 , 74 ) ;
     };
     CheckBox CB_DISPLAY_AS_ICON
     {
+        HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON";
         Hide = TRUE ;
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 150 , 62 ) ;
@@ -87,6 +92,7 @@ ModalDialog MD_PASTE_OBJECT
 */
     PushButton PB_CHANGE_ICON
     {
+        HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 150 , 111 ) ;
         Size = MAP_APPFONT ( 64 , 14 ) ;
@@ -121,6 +127,7 @@ ModalDialog MD_PASTE_OBJECT
 };
 ModalDialog MD_UPDATE_BASELINKS
 {
+    HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 337 , 166 ) ;
@@ -164,24 +171,28 @@ ModalDialog MD_UPDATE_BASELINKS
     };
     PushButton PB_UPDATE_NOW
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW";
         Pos = MAP_APPFONT ( 270 , 43 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Update" ;
     };
     PushButton PB_OPEN_SOURCE
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE";
         Pos = MAP_APPFONT ( 270 , 60 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Open" ;
     };
     PushButton PB_CHANGE_SOURCE
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE";
         Pos = MAP_APPFONT ( 270 , 77 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
     };
     PushButton PB_BREAK_LINK
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK";
         Pos = MAP_APPFONT ( 270 , 94 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Break Link" ;
@@ -212,12 +223,14 @@ ModalDialog MD_UPDATE_BASELINKS
     };
     RadioButton RB_AUTOMATIC
     {
+        HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC";
         Pos = MAP_APPFONT ( 70 , 150 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton RB_MANUAL
     {
+        HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL";
         Pos = MAP_APPFONT ( 133 , 150 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */
@@ -273,6 +286,7 @@ ModalDialog MD_UPDATE_BASELINKS
 };
 ModalDialog MD_LINKEDIT
 {
+    HelpID = "cui:ModalDialog:MD_LINKEDIT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 222 , 58 ) ;
@@ -304,6 +318,7 @@ ModalDialog MD_LINKEDIT
     };
     Edit ED_FULL_SOURCE_NAME
     {
+        HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 5 , 35 ) ;
         Size = MAP_APPFONT ( 155 , 12 ) ;
@@ -312,42 +327,49 @@ ModalDialog MD_LINKEDIT
 };
 ModalDialog MD_INSERT_OLEOBJECT
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OLEOBJECT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 105 ) ;
     Moveable = TRUE ;
     RadioButton RB_NEW_OBJECT
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 81 , 10 ) ;
         Text [ en-US ] = "~Create new" ;
     };
     RadioButton RB_OBJECT_FROMFILE
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE";
         Pos = MAP_APPFONT ( 90 , 6 ) ;
         Size = MAP_APPFONT ( 81 , 10 ) ;
         Text [ en-US ] = "Create from ~file" ;
     };
     ListBox LB_OBJECTTYPE
     {
+        HelpID = "cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 33 ) ;
         Size = MAP_APPFONT ( 204 , 60 ) ;
     };
     Edit ED_FILEPATH
     {
+        HelpID = "cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 33 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_FILEPATH
     {
+        HelpID = "cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH";
         Pos = MAP_APPFONT ( 166 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Search..." ;
     };
     CheckBox CB_FILELINK
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK";
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 138 , 10 ) ;
         Text [ en-US ] = "~Link to file" ;
@@ -385,18 +407,21 @@ ModalDialog MD_INSERT_OLEOBJECT
 };
 ModalDialog MD_INSERT_OBJECT_PLUGIN
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_PLUGIN";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 123 ) ;
     Moveable = TRUE ;
     Edit ED_FILEURL
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_FILEURL
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL";
         Pos = MAP_APPFONT ( 166 , 29 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Browse..." ;
@@ -409,6 +434,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
     };
     MultiLineEdit ED_PLUGINS_OPTIONS
     {
+        HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -441,6 +467,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
 };
 ModalDialog MD_INSERT_OBJECT_APPLET
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 164 ) ;
@@ -453,6 +480,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     Edit ED_CLASSFILE
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
@@ -465,12 +493,14 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     Edit ED_CLASSLOCATION
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_CLASS
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS";
         Pos = MAP_APPFONT ( 166 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Search..." ;
@@ -483,6 +513,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     MultiLineEdit ED_APPLET_OPTIONS
     {
+        HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 107 ) ;
         Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -524,6 +555,7 @@ Control TB_LINKS
 
 ModalDialog MD_INSERT_OBJECT_IFRAME
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME";
     Size = MAP_APPFONT ( 302 , 98 ) ;
     Hide = TRUE ;
     Moveable = TRUE ;
@@ -554,6 +586,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     Edit ED_FRAMENAME
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 45 , 6 ) ;
         Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -567,6 +600,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     Edit ED_URL
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 45 , 24 ) ;
         Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -574,6 +608,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     PushButton BT_FILEOPEN
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN";
         Pos = MAP_APPFONT ( 226 , 24 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -581,6 +616,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGON
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -588,6 +624,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGOFF
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -595,6 +632,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGAUTO
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -608,6 +646,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_FRMBORDER_ON
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 81 , 53 ) ;
         Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -615,6 +654,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_FRMBORDER_OFF
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 81 , 66 ) ;
         Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -639,6 +679,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     NumericField NM_MARGINWIDTH
     {
+        HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 167 , 54 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -652,6 +693,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     CheckBox CB_MARGINWIDTHDEFAULT
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 190 , 56 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
@@ -665,6 +707,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     NumericField NM_MARGINHEIGHT
     {
+        HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 167 , 72 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -678,6 +721,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     CheckBox CB_MARGINHEIGHTDEFAULT
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 190 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
index 9e9d2fb6eb03..4d6b96445115 100644
--- a/cui/source/dialogs/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -28,6 +28,7 @@
 
 ModalDialog RID_SVX_DLG_INPUTRECORDNO
 {
+    HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 130 , 45 ) ;
@@ -43,6 +44,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
     };
     NumericField 1
     {
+        HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 6 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index bf617b126747..c1811b196895 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -57,6 +57,7 @@
 #include <i18npool/mslangid.hxx>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
+#include <svl/lngmisc.hxx>
 
 
 #include <stack>
@@ -73,36 +74,6 @@ using ::rtl::OUString;
 #define A2S(x)          String::CreateFromAscii( x )
 
 
-
-// GetReplaceEditString -------------------------------
-
-static void GetReplaceEditString( String &rText )
-{
-    // The strings returned by the thesaurus saometimes have some
-    // explanation text put in between '(' and ')' or a trailing '*'.
-    // These parts should not be put in the ReplaceEdit Text that may get
-    // inserted into the document. Thus we strip them from the text.
-
-    xub_StrLen nPos = rText.Search( sal_Unicode('(') );
-    while (STRING_NOTFOUND != nPos)
-    {
-        xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos );
-        if (STRING_NOTFOUND != nEnd)
-            rText.Erase( nPos, nEnd-nPos+1 );
-        else
-            break;
-        nPos = rText.Search( sal_Unicode('(') );
-    }
-
-    nPos = rText.Search( sal_Unicode('*') );
-    if (STRING_NOTFOUND != nPos)
-        rText.Erase( nPos );
-
-    // remove any possible remaining ' ' that may confuse the thesaurus
-    // when it gets called with the text
-    rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') );
-}
-
 // class LookUpComboBox_Impl --------------------------------------------------
 
 LookUpComboBox_Impl::LookUpComboBox_Impl(
@@ -172,12 +143,21 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele
 
 // class ThesaurusAlternativesCtrl_Impl ----------------------------------
 
+AlternativesString_Impl::AlternativesString_Impl(
+    ThesaurusAlternativesCtrl_Impl &rControl,
+    SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
+    //
+    SvLBoxString( pEntry, nFlags, rStr ),
+    m_rControlImpl( rControl )
+{
+}
+
 void AlternativesString_Impl::Paint(
     const Point& rPos,
     SvLBox& rDev, USHORT,
     SvLBoxEntry* pEntry )
 {
-    AlternativesUserData_Impl* pData = (AlternativesUserData_Impl*)pEntry->GetUserData();
+    AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
     Point aPos( rPos );
     Font aOldFont( rDev.GetFont());
     if (pData && pData->IsHeader())
@@ -207,14 +187,40 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
 
 ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl()
 {
-    ClearUserData();
+    ClearExtraData();
+}
+
+
+void ThesaurusAlternativesCtrl_Impl::ClearExtraData()
+{
+    UserDataMap_t   aEmpty;
+    m_aUserData.swap( aEmpty );
+}
+
+
+void ThesaurusAlternativesCtrl_Impl::SetExtraData(
+    const SvLBoxEntry *pEntry,
+    const AlternativesExtraData &rData )
+{
+    if (!pEntry)
+        return;
+
+    UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
+    if (aIt != m_aUserData.end())
+        aIt->second = rData;
+    else
+        m_aUserData[ pEntry ] = rData;
 }
 
 
-void ThesaurusAlternativesCtrl_Impl::ClearUserData()
+AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData(
+    const SvLBoxEntry *pEntry )
 {
-    for (USHORT i = 0; i < GetEntryCount(); ++i)
-        delete (AlternativesUserData_Impl*)GetEntry(i)->GetUserData();
+    AlternativesExtraData *pRes = NULL;
+    UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
+    if (aIt != m_aUserData.end())
+        pRes = &aIt->second;
+    return pRes;
 }
 
 
@@ -230,10 +236,9 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
     pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column
     aText += rText;
     pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) );  // otherwise crash
-    pEntry->AddItem( new AlternativesString_Impl( pEntry, 0, aText ) );
+    pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) );
 
-    AlternativesUserData_Impl* pUserData = new AlternativesUserData_Impl( rText, bIsHeader );
-    pEntry->SetUserData( pUserData );
+    SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) );
     GetModel()->Insert( pEntry );
 
     if (bIsHeader)
@@ -365,7 +370,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
     m_pAlternativesCT->SetUpdateMode( FALSE );
 
     // clear old user data of control before creating new ones via AddEntry below
-    m_pAlternativesCT->ClearUserData();
+    m_pAlternativesCT->ClearExtraData();
 
     m_pAlternativesCT->Clear();
     for (sal_Int32 i = 0;  i < nMeanings;  ++i)
@@ -454,7 +459,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox )
     {
         USHORT nPos = pBox->GetSelectEntryPos();
         String aStr( pBox->GetEntry( nPos ) );
-        GetReplaceEditString( aStr );
+        aStr = linguistic::GetThesaurusReplaceText( aStr );
         aWordCB.SetText( aStr );
         LookUp_Impl();
     }
@@ -468,12 +473,12 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox
     SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
     if (pEntry)
     {
-        AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData();
+        AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
         String aStr;
-        if (!pData->IsHeader())
+        if (pData && !pData->IsHeader())
         {
             aStr = pData->GetText();
-            GetReplaceEditString( aStr );
+            aStr = linguistic::GetThesaurusReplaceText( aStr );
         }
         aReplaceEdit.SetText( aStr );
     }
@@ -486,12 +491,12 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
     SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
     if (pEntry)
     {
-        AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData();
+        AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
         String aStr;
-        if (!pData->IsHeader())
+        if (pData && !pData->IsHeader())
         {
             aStr = pData->GetText();
-            GetReplaceEditString( aStr );
+            aStr = linguistic::GetThesaurusReplaceText( aStr );
         }
 
         aWordCB.SetText( aStr );
@@ -509,8 +514,8 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
 IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
 {
     (void) pThis;
-    if (pBox && pBox->GetEntryCount() > 0)
-        pBox->SelectEntryPos( 0 );
+    if (pBox && pBox->GetEntryCount() >= 2)
+        pBox->SelectEntryPos( 1 );  // pos 0 is a 'header' that is not selectable
     return 0;
 }
 
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 16d724473d20..8592a9fb50cc 100755..100644
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -34,7 +34,7 @@
  // RID_SVXDLG_THES -------------------------------------------------------
 ModalDialog RID_SVXDLG_THESAURUS
 {
-    HelpId = SID_THESAURUS ;
+    HelpId = CMD_SID_THESAURUS ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 235, 230 ) ;
     Text [ en-US ] = "Thesaurus" ;
@@ -50,6 +50,7 @@ ModalDialog RID_SVXDLG_THESAURUS
 
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT";
         Pos = MAP_APPFONT ( 5 , 15 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -59,17 +60,19 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         Pos = MAP_APPFONT ( 24 , 5 ) ;
         Size = MAP_APPFONT ( 143 , 8 ) ;
-        Text [ en-US ] = "Current ~word" ;
+        Text [ en-US ] = "~Current word" ;
         LEFT = TRUE ;
     };
     ComboBox CB_WORD
     {
+        HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD";
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 24 , 16 ) ;
         Size = MAP_APPFONT ( 141 , 60 ) ;   // have drop down space for several lines
     };
     MenuButton MB_LANGUAGE
     {
+        HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE";
         Pos = MAP_APPFONT ( 170 , 16 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Language" ;
@@ -95,11 +98,12 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         Pos = MAP_APPFONT ( 5 , 173 ) ;
         Size = MAP_APPFONT ( 255 , 8 ) ;
-        Text [ en-US ] = "Replace ~with" ;
+        Text [ en-US ] = "~Replace with" ;
         LEFT = TRUE ;
     };
     Edit ED_REPL
     {
+        HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL";
         BORDER = TRUE ;
         Pos = MAP_APPFONT ( 5 , 184 ) ;
         Size = MAP_APPFONT ( 225 , 12 ) ;
@@ -120,7 +124,7 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         Pos = MAP_APPFONT ( 105 , 210 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Replace" ;
+        Text [ en-US ] = "Replace" ;
         DefButton = TRUE ;
     };
     CancelButton BTN_THES_CANCEL
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 70ce91391456..b682c8d0c129 100755
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -51,11 +51,16 @@
 #include <com/sun/star/linguistic2/XMeaning.hpp>
 
 #include <stack>
+#include <map>
 #include <algorithm>
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
+class SvLBoxEntry;
+class ThesaurusAlternativesCtrl_Impl;
+
+
 // class LookUpComboBox_Impl --------------------------------------------------
 
 class LookUpComboBox_Impl : public ComboBox
@@ -105,17 +110,14 @@ public:
 
 // class ThesaurusAlternativesCtrl_Impl ----------------------------------
 
-class AlternativesUserData_Impl
+class AlternativesExtraData
 {
     String  sText;
     bool    bHeader;
 
-    // disable copy c-tor and assignment operator
-    AlternativesUserData_Impl( const AlternativesUserData_Impl & );
-    AlternativesUserData_Impl & operator = ( const AlternativesUserData_Impl & );
-
 public:
-    AlternativesUserData_Impl( const String &rText, bool bIsHeader ) :
+    AlternativesExtraData() : bHeader( false ) {}
+    AlternativesExtraData( const String &rText, bool bIsHeader ) :
         sText(rText),
         bHeader(bIsHeader)
         {
@@ -128,10 +130,11 @@ public:
 
 class AlternativesString_Impl : public SvLBoxString
 {
+    ThesaurusAlternativesCtrl_Impl &    m_rControlImpl;
 public:
 
-    AlternativesString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr )
-        : SvLBoxString( pEntry, nFlags, rStr ) {}
+    AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl,
+        SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr );
 
     virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry);
 };
@@ -142,6 +145,9 @@ class ThesaurusAlternativesCtrl_Impl :
 {
     SvxThesaurusDialog_Impl &   m_rDialogImpl;
 
+    typedef std::map< const SvLBoxEntry *, AlternativesExtraData >  UserDataMap_t;
+    UserDataMap_t           m_aUserData;
+
     // disable copy c-tor and assignment operator
     ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & );
     ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & );
@@ -152,7 +158,10 @@ public:
 
 
     SvLBoxEntry *   AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader );
-    void            ClearUserData();
+
+    void            ClearExtraData();
+    void            SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData );
+    AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry );
 
     virtual void    KeyInput( const KeyEvent& rKEvt );
     virtual void    Paint( const Rectangle& rRect );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 1b6d1c37651e..e838e94c0db6 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -58,13 +58,6 @@
 
 // static ----------------------------------------------------------------
 
-static USHORT pRanges[] =
-{
-    SID_ATTR_ZOOM,
-    SID_ATTR_ZOOM,
-    0
-};
-
 #define SPECIAL_FACTOR  ((USHORT)0xFFFF)
 
 // class SvxZoomDialog ---------------------------------------------------
@@ -124,29 +117,6 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId )
 
 // -----------------------------------------------------------------------
 
-void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
-{
-    switch ( nBtnId )
-    {
-        case ZOOMBTN_OPTIMAL: // Optimal-Button
-            aOptimalBtn.SetText( rNewTxt );
-            break;
-
-        case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button
-            aPageWidthBtn.SetText( rNewTxt );
-            break;
-
-        case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button
-            aWholePageBtn.SetText( rNewTxt );
-            break;
-
-        default:
-            DBG_ERROR( "wrong button number" );
-    }
-}
-
-// -----------------------------------------------------------------------
-
 void SvxZoomDialog::HideButton( USHORT nBtnId )
 {
     switch ( nBtnId )
@@ -181,13 +151,6 @@ void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax )
 
 // -----------------------------------------------------------------------
 
-void SvxZoomDialog::SetSpinSize( USHORT nNewSpin )
-{
-    aUserEdit.SetSpinSize( nNewSpin );
-}
-
-// -----------------------------------------------------------------------
-
 SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
 
     SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_ZOOM ) ),
@@ -218,7 +181,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
 
 {
 #if ENABLE_LAYOUT
-    SetHelpId (SID_ATTR_ZOOM);
+    SetHelpId (".uno:Zoom");
 #endif /* ENABLE_LAYOUT */
     Link aLink = LINK( this, SvxZoomDialog, UserHdl );
     a100Btn.SetClickHdl( aLink );
@@ -370,13 +333,6 @@ SvxZoomDialog::~SvxZoomDialog()
 
 // -----------------------------------------------------------------------
 
-USHORT* SvxZoomDialog::GetRanges()
-{
-    return pRanges;
-}
-
-// -----------------------------------------------------------------------
-
 IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
 {
     bModified |= TRUE;
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 8137b1c7bb89..56b274ef75ff 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -28,11 +28,12 @@
 #include <cuires.hrc>
 #include "zoom.hrc"
 #include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
+#include "helpid.hrc"
 
  // RID_SVXDLG_ZOOM -------------------------------------------------------
 ModalDialog RID_SVXDLG_ZOOM
 {
-    HelpId = SID_ATTR_ZOOM ;
+    HelpId = CMD_SID_ATTR_ZOOM;
     OutputSize = TRUE ;
     SvLook = TRUE ;
     Size = MAP_APPFONT ( 242 , 112 ) ;
@@ -46,36 +47,42 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     RadioButton BTN_OPTIMAL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Optimal" ;
     };
     RadioButton BTN_WHOLE_PAGE
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Fit width and height" ;
     };
     RadioButton BTN_PAGE_WIDTH
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text [ en-US ] = "Fit ~width" ;
     };
     RadioButton BTN_100
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text = "~100 %" ;
     };
     RadioButton BTN_USER
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER";
         Pos = MAP_APPFONT ( 12 , 67 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         Text [ en-US ] = "~Variable" ;
     };
     MetricField ED_USER
     {
+        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER";
         Pos = MAP_APPFONT ( 86 , 66 ) ;
         Size = MAP_APPFONT ( 32 , 12 ) ;
         Border = TRUE ;
@@ -95,24 +102,28 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     RadioButton BTN_AUTOMATIC
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC";
         Pos = MAP_APPFONT ( 130 , 14 ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton BTN_SINGLE
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE";
         Pos = MAP_APPFONT ( 130, 27 ) ;
         Size = MAP_APPFONT ( 106, 10 ) ;
         Text [ en-US ] = "~Single page" ;
     };
     RadioButton BTN_COLUMNS
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS";
         Pos = MAP_APPFONT ( 130, 41 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "~Columns" ;
     };
     MetricField ED_COLUMNS
     {
+        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS";
         Pos = MAP_APPFONT ( 209 , 40 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -126,6 +137,7 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     CheckBox CHK_BOOK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK";
         Pos = MAP_APPFONT ( 136 , 55 ) ;
         Size = MAP_APPFONT ( 85 , 10 ) ;
         Text [ en-US ] = "~Book mode" ;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8929e9ebdef5..1f441d728d63 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -100,6 +100,7 @@
 #include "macroass.hxx"
 #include "acccfg.hxx"
 #include "insrc.hxx"
+#include "passwdomdlg.hxx"
 #include "hyphen.hxx"
 #include "thesdlg.hxx"
 
@@ -162,6 +163,7 @@ IMPL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractLinksDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSpellDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSvxPostItDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractPasswordToOpenModifyDialog_Impl);
 
 //////////////////////////////////////////////////////////////////////////
 // VclAbstractDialog2_Impl
@@ -723,13 +725,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck
     else
         pDlg->SetCheckNameHdl( Link(), bCheckImmediately );
 }
-void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId)
+void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId)
 {
-    pDlg->SetEditHelpId( nHelpId );
+    pDlg->SetEditHelpId( aHelpId );
 }
-void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId )
+void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
 {
-    pDlg->SetHelpId( nHelpId );
+    pDlg->SetHelpId( aHelpId );
 }
 void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr )
 {
@@ -841,9 +843,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle )
     pDlg->SetText( rNewTitle );
 }
 
-void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId )
+void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
 {
-    pDlg->SetHelpId( nHelpId );
+    pDlg->SetHelpId( aHelpId );
 }
 
 Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
@@ -983,6 +985,19 @@ Window * AbstractSvxPostItDialog_Impl::GetWindow()
     return (Window *)pDlg;
 }
 
+String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const
+{
+    return pDlg->GetPasswordToOpen();
+}
+String AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToModify() const
+{
+    return pDlg->GetPasswordToModify();
+}
+bool AbstractPasswordToOpenModifyDialog_Impl::IsRecommendToOpenReadonly() const
+{
+    return pDlg->IsRecommendToOpenReadonly();
+}
+
 // Create dialogs with simplest interface
 VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId )
 {
@@ -1873,47 +1888,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
     return 0;
 }
 
-SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
             const Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList )
 {
     InsertObjectDialog_Impl* pDlg=0;
-    switch ( nSlotId )
-    {
-        case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break;
-        case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break;
-        case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break;
-        case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break;
-        default: break;
-    }
+    if ( rCommand.equalsAscii(".uno:InsertObject" ) )
+        pDlg = new SvInsertOleDlg( pParent, xStor, pList );
+    else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) )
+        pDlg = new SvInsertPlugInDialog( pParent, xStor );
+    else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
+        pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor );
 
     if ( pDlg )
     {
-        pDlg->SetHelpId( nSlotId );
+        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
         return new AbstractInsertObjectDialog_Impl( pDlg );
     }
     return 0;
 }
 
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent,  const rtl::OUString& rCommand,
             const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
 {
     InsertObjectDialog_Impl* pDlg=0;
-    switch ( nSlotId )
-    {
-        case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break;
-        case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break;
-        default: break;
-    }
-
-    if ( pDlg )
+    if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
     {
-        pDlg->SetHelpId( nSlotId );
+        pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
+        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
         return new VclAbstractDialog_Impl( pDlg );
     }
     return 0;
 }
 
+
+
 SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent )
 {
     return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) );
@@ -1948,7 +1957,17 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
     return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) );
 }
 
-SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId )
+SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId )
 {
-    return new SvxInsRowColDlg( pParent, bCol, nHelpId );
+    return new SvxInsRowColDlg( pParent, bCol, sHelpId );
 }
+
+AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog(
+    Window * pParent,
+    sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify )
+{
+    PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify );
+    return new AbstractPasswordToOpenModifyDialog_Impl( pDlg );
+}
+
+
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 844439efbf61..b68e10c25cdd 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -235,24 +235,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
     virtual SfxBindings& GetBindings();
 };
 
-//for SvxSpellCheckDialog begin
-//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog
-//STRIP001 {
-//STRIP001 SvxSpellCheckDialog * pDlg;
-//STRIP001 public
-//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p)
-//STRIP001 : pDlg(p)
-//STRIP001 {}
-//STRIP001 virtual  USHORT          Execute() ;
-//STRIP001 virtual  void SetNewEditWord( const String& _rNew ) ;
-//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ;
-//STRIP001 virtual void HideAutoCorrect() ;
-//STRIP001 virtual String   GetNewEditWord();
-//STRIP001 virtual void SetNewEditWord( const String& _rNew );
-//STRIP001 }
-//for SvxSpellCheckDialog end
-
-
 //for SearchProgress begin
 class SearchProgress;
 class AbstractSearchProgress_Impl : public AbstractSearchProgress
@@ -414,9 +396,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
     DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
     virtual void    GetName( String& rName ) ;
     virtual void    SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ;
-    virtual void    SetEditHelpId(ULONG nHelpId) ;
+    virtual void    SetEditHelpId(const rtl::OString&) ;
     //from class Window
-    virtual void    SetHelpId( ULONG nHelpId ) ;
+    virtual void    SetHelpId( const rtl::OString& ) ;
     virtual void    SetText( const XubString& rStr ) ;
 private:
     Link aCheckNameHdl;
@@ -486,7 +468,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
     virtual void            EnableRadioButtonMode();
     virtual void            SetTitle( const String& rNewTitle );
     //From Class Window
-    virtual void    SetHelpId( ULONG nHelpId ) ;
+    virtual void    SetHelpId( const rtl::OString& ) ;
 
 };
 //for SvxMultiFileDialog end
@@ -589,6 +571,19 @@ private:
 };
 //add for SvxPostItDialog end
 
+//for PasswordToOpenModifyDialog begin
+class PasswordToOpenModifyDialog;
+class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenModifyDialog
+{
+    DECL_ABSTDLG_BASE( AbstractPasswordToOpenModifyDialog_Impl, PasswordToOpenModifyDialog )
+
+    virtual String  GetPasswordToOpen() const;
+    virtual String  GetPasswordToModify() const;
+    virtual bool    IsRecommendToOpenReadonly() const;
+};
+//for PasswordToOpenModifyDialog end
+
+
 //------------------------------------------------------------------------
 //AbstractDialogFactory_Impl implementations
 class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
@@ -636,10 +631,10 @@ public:
                                             const SfxItemSet& rAttr,
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone);
-    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
             const SvObjectServerList* pList = 0 );
-    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+    virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
    virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent );
    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0  );
@@ -795,7 +790,9 @@ public:
     virtual VclAbstractDialog*          CreateOptionsDialog(
         Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext );
 
-    virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
+    virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
+
+    virtual AbstractPasswordToOpenModifyDialog *    CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
 };
 
 #endif
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4b104c6739ff..aa8224654c65 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -184,9 +184,7 @@ private:
 
     String                      GetLabel4Command(const String& sCommand);
     void                        InitAccCfg();
-    KeyCode                     MapPosToKeyCode( USHORT nPos ) const;
     USHORT                      MapKeyCodeToPos( const KeyCode &rCode ) const;
-    String                      GetFunctionName( KeyFuncType eType ) const;
     css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
     void                        StartFileDialog( WinBits nBits, const String& rTitle );
 
@@ -202,10 +200,7 @@ public:
     virtual BOOL                FillItemSet( SfxItemSet& );
     virtual void                Reset( const SfxItemSet& );
 
-    void                        SelectMacro(const SfxMacroInfoItem*);
     void                        Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
-    void                        CopySource2Target(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xSourceAccMgr,
-                                                  const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xTargetAccMgr);
     static SfxTabPage*          Create( Window* pParent, const SfxItemSet& rAttrSet );
 };
 
@@ -223,50 +218,6 @@ public:
     void ExpandEntry ( USHORT nPos, const String &rStr );
 };
 
-/*
-// class USHORTArr **********************************************************
-
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
-    OKButton           aOKButton;
-    CancelButton       aCancelButton;
-    PushButton         aChangeButton;
-    PushButton         aRemoveButton;
-    SfxAcceleratorConfigListBox aEntriesBox;
-    FixedText          aDescriptionTextText;
-    FixedText          aDescriptionInfoText;
-    FixedLine          aKeyboardGroup;
-    FixedText          aGroupText;
-    ListBox            aGroupLBox;
-    FixedText          aFunctionText;
-    ListBox            aFunctionBox;
-    FixedText          aKeyText;
-    ListBox            aKeyBox;
-    FixedLine          aFunctionsGroup;
-
-    USHORTArr     aAccelArr;
-    USHORTArr     aFunctionArr;
-    USHORTArr     aKeyArr;
-
-    void OKHdl    ( Button  * );
-    void ChangeHdl( Button  * );
-    void RemoveHdl( Button  * );
-    void SelectHdl( ListBox *pListBox );
-
-    KeyCode PosToKeyCode   ( USHORT nPos )          const;
-    USHORT  KeyCodeToPos   ( const KeyCode &rCode ) const;
-    String  GetFunctionName( KeyFuncType eType )    const;
-
-public:
-
-    SfxAcceleratorConfigDialog( Window *pParent );
-};
-*/
-
 class SvxShortcutAssignDlg : public SfxSingleTabDialog
 {
 public:
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index ecf0f81dd754..8d63c5f8dd49 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -75,8 +75,6 @@ public:
     SvxConfigDialog( Window*, const SfxItemSet* );
     ~SvxConfigDialog();
 
-    void                        ActivateTabPage( USHORT );
-
     virtual void                PageCreated( USHORT nId, SfxTabPage &rPage );
     virtual short               Ok();
 
@@ -258,12 +256,6 @@ private:
 
 public:
 
-    SvxConfigEntry(
-        const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue >& rProperties,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
-
     SvxConfigEntry( const ::rtl::OUString& rDisplayName,
                     const ::rtl::OUString& rCommandURL,
                     bool bPopup = FALSE,
@@ -337,11 +329,6 @@ public:
 
     sal_Int32   GetStyle() { return nStyle; }
     void        SetStyle( sal_Int32 style ) { nStyle = style; }
-
-    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
-        GetProperties(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XNameAccess >& rCommandToLabelMap );
 };
 
 class SvxMenuEntriesListBox : public SvTreeListBox
@@ -694,7 +681,6 @@ public:
     void            RestoreToolbar( SvxConfigEntry* pToolbar );
     void            RemoveToolbar( SvxConfigEntry* pToolbar );
     void            ApplyToolbar( SvxConfigEntry* pToolbar );
-    void            ReloadToolbar( const rtl::OUString& rURL );
 
     rtl::OUString   GetSystemUIName( const rtl::OUString& rResourceURL );
 
@@ -744,7 +730,7 @@ public:
             aBtnOK.Enable( rLink.Call( this ) > 0 );
     }
 
-    void    SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+    void    SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
 };
 
 class SvxIconSelectorDialog : public ModalDialog
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 5a5d9ee0473a..944fca908b8a 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -139,12 +139,8 @@ public:
                   ~SfxConfigFunctionListBox_Impl();
 
     void          ClearAll();
-    SvLBoxEntry*  GetEntry_Impl( USHORT nId );
-    SvLBoxEntry*  GetEntry_Impl( const String& );
-    USHORT        GetId( SvLBoxEntry *pEntry );
     using Window::GetHelpText;
     String        GetHelpText( SvLBoxEntry *pEntry );
-    USHORT        GetCurId() { return GetId( FirstSelected() ); }
     String        GetCurCommand();
     String        GetCurLabel();
     SfxMacroInfo* GetMacroInfo();
@@ -173,7 +169,6 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
-    ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
 
     void InitModule();
     void InitBasic();
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 0f09c8971e5d..315a78e70a03 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -155,7 +155,6 @@ private:
     void                Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
     BOOL                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
     void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
 
     DECL_LINK(          UpdateHdl_Impl, Timer* );
     DECL_LINK(          FontModifyHdl_Impl, void* );
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index e7cc7e1ca2f4..52549e934ecc 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -284,6 +284,9 @@
 #define RID_SVXSTR_ARCHIVE_HEADLINE         (RID_SVX_START + 485)
 #define RID_SVXSTR_MULTIFILE_DBL_ERR        (RID_SVX_START + 486)
 
+// password to open/modify dialog
+#define RID_DLG_PASSWORD_TO_OPEN_MODIFY     (RID_SVX_START + 500)
+
 // multi path dialog
 #define RID_SVXDLG_MULTIPATH                (RID_SVX_START + 201)
 #define RID_MULTIPATH_DBL_ERR               (RID_SVX_START + 207)
@@ -428,4 +431,12 @@
 #define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
 #define RID_SVXSTR_EVENT_LAYOUT_FINISHED                    (RID_SVX_START + 1189)
 
+// For now, keep new IDs unique only within cui.
+// Later, cui should perhaps get an own range of IDs.
+#define RID_SVXSTR_EVENT_SELECTIONCHANGED                   (RID_SVX_START + 1190)
+#define RID_SVXSTR_EVENT_DOUBLECLICK                        (RID_SVX_START + 1191)
+#define RID_SVXSTR_EVENT_RIGHTCLICK                         (RID_SVX_START + 1192)
+#define RID_SVXSTR_EVENT_CALCULATE                          (RID_SVX_START + 1193)
+#define RID_SVXSTR_EVENT_CONTENTCHANGED                     (RID_SVX_START + 1194)
+
 #endif
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index be4c4bc0cd7a..d1b835cd1966 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -67,7 +67,6 @@ public:
     virtual void    Activate();
 
     INT32           GetTransliterationFlags() const;
-    void            SetTransliterationFlags( INT32 nSettings );
 };
 
 #endif
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index a2ef9da67553..b89ec4e779a0 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -95,13 +95,6 @@ namespace svx
         */
         void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL);
 
-        /** opens a file pciker to select a database file
-            @param  _sLocation
-                If set, the file picker use it as default directory
-            @return
-                the location of the database file
-        */
-        String getFileLocation(const String& _sLocation);
 #endif
 
     public:
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ae7aa832d264..173ef8e45139 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -91,7 +91,7 @@ public:
             aBtnOK.Enable( rLink.Call( this ) > 0 );
     }
 
-    void    SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+    void    SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 287fa206f148..6c344cec81c5 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -152,7 +152,6 @@ namespace svx
         void    SetIgnoreAllHdl( const Link& _rHdl );
         void    SetChangeHdl( const Link& _rHdl );
         void    SetChangeAllHdl( const Link& _rHdl );
-        void    SetOptionsHdl( const Link& _rHdl );
 
         void    SetClickByCharacterHdl( const Link& _rHdl );
         void    SetConversionFormatChangedHdl( const Link& _rHdl );
@@ -174,8 +173,6 @@ namespace svx
         editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const;
 
         void            SetByCharacter( sal_Bool _bByCharacter );
-        sal_Bool        GetByCharacter( ) const;
-
         void            SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection );
 
         // should text which does not match the primary conversion direction be ignored?
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c4a50ec1bf62..dff73253b086 100755..100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -28,364 +28,363 @@
 #define _CUI_HELPID_HRC
 // include ---------------------------------------------------------------
 
-#include <svl/solar.hrc>
+#include <svx/svxcommands.h>
+#include <sfx2/sfxcommands.h>
 
 // Help-Ids --------------------------------------------------------------
 
-#define HID_OPTIONS_COLOR                           (HID_CUI_START +   1)
-#define HID_OPTIONS_SAVE                            (HID_CUI_START +   2)
-#define HID_OPTIONS_PATH                            (HID_CUI_START +   3)
-#define HID_OPTIONS_GENERAL                         (HID_CUI_START +   4)
-#define HID_OPTIONS_LINGU                           (HID_CUI_START +   5)
-#define HID_OPTIONS_SPELL                           (HID_CUI_START +   6)
-#define HID_OPTIONS_DICT_NEW                        (HID_CUI_START +   7)
-#define HID_OPTIONS_DICT_EDIT                       (HID_CUI_START +   8)
-#define HID_OPTIONS_INET                            (HID_CUI_START +   9)
-#define HID_OPTIONS_CHART_DEFCOLORS                 (HID_CUI_START +  10)
-#define HID_OPTIONS_CTL                             (HID_CUI_START +  11)
-#define HID_OPTIONS_PROXY                           (HID_CUI_START +  12)
-#define HID_OPTIONS_SEARCH                          (HID_CUI_START +  13)
-#define HID_OPTIONS_MAIL                            (HID_CUI_START +  14)
-#define HID_OPTIONS_ASIAN_LAYOUT                    (HID_CUI_START +  15)
-#define HID_CLB_EDIT_MODULES_DICS                   (HID_CUI_START +  16)
-#define HID_CLB_EDIT_MODULES_MODULES                (HID_CUI_START +  17)
-#define HID_CLB_LINGU_MODULES                       (HID_CUI_START +  18)
-#define HID_CLB_LINGU_OPTIONS                       (HID_CUI_START +  19)
-#define HID_EDIT_MODULES                            (HID_CUI_START +  20)
-#define HID_LNGDLG_NUM_PREBREAK                     (HID_CUI_START +  21)
-#define HID_OPTIONS_COLORCONFIG                     (HID_CUI_START +  22)
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME         (HID_CUI_START +  23)
-#define HID_OPTIONS_ACCESSIBILITYCONFIG             (HID_CUI_START +  24)
-#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN       (HID_CUI_START +  25)
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME         (HID_CUI_START +  26)
-#define HID_OPTIONS_PATHS_SELECTFOLDER              (HID_CUI_START +  27)
-#define HID_OPTIONS_JAVA                            (HID_CUI_START +  28)
-#define HID_OPTIONS_JAVA_LIST                       (HID_CUI_START +  29)
-#define HID_OPTIONS_JAVA_PARAMETER                  (HID_CUI_START +  30)
-#define HID_OPTIONS_JAVA_CLASSPATH                  (HID_CUI_START +  31)
-#define HID_SVXPAGE_JSEARCH_OPTIONS                 (HID_CUI_START +  32)
-#define HID_SVXDLG_FILTER_WARNING                   (HID_CUI_START +  33)
-#define HID_SVX_OPTIONS_ONLINEUPDATE                (HID_CUI_START +  34)
-#define HID_DLG_SECURITY_OPTIONS                    (HID_CUI_START +  35)
-#define HID_OFADLG_OPTIONS_TREE                     (HID_CUI_START +  36)
-#define HID_OFA_CONNPOOL_DRIVERLIST                 (HID_CUI_START +  37)
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK            (HID_CUI_START +  38)
-#define HID_OFA_FONT_SUBST_CLB                      (HID_CUI_START +  39)
-#define HID_OFA_TP_MISC                             (HID_CUI_START +  40)
-#define HID_OFA_TP_VIEW                             (HID_CUI_START +  41)
-#define HID_OFA_TP_LANGUAGES                        (HID_CUI_START +  42)
-#define HID_OFA_TP_MEMORY                           (HID_CUI_START +  43)
-#define HID_DBPATH_CTL_PATH                         (HID_CUI_START +  44)
-#define HID_DBPATH_HEADERBAR                        (HID_CUI_START +  45)
-#define HID_OFAPAGE_SMARTTAG_OPTIONS                (HID_CUI_START +  46)
-#define HID_OFAPAGE_MSFLTR2_CLB                     (HID_CUI_START +  47)
-#define HID_OPTPATH_CTL_PATH                        (HID_CUI_START +  48)
-#define HID_OFADLG_TREELISTBOX                      (HID_CUI_START +  49)
-#define HID_DLG_WEBCONNECTION_INFO                  (HID_CUI_START +  50)
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST          (HID_CUI_START +  51)
-#define HID_OPTPATH_HEADERBAR                       (HID_CUI_START +  52)
-#define HID_WARN_NAME_DUPLICATE                     (HID_CUI_START +  53)
-#define HID_COLORPAGE_LISTBOX_START                 (HID_CUI_START +  54)
-#define HID_COLORPAGE_DOCCOLOR_LB                   (HID_CUI_START +  54)
-#define HID_COLORPAGE_DOCBOUNDARIES_LB              (HID_CUI_START +  55)
-#define HID_COLORPAGE_APPBACKGROUND_LB              (HID_CUI_START +  56)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB           (HID_CUI_START +  57)
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB            (HID_CUI_START +  58)
-#define HID_COLORPAGE_FONTCOLOR_LB                  (HID_CUI_START +  59)
-#define HID_COLORPAGE_LINKS_LB                      (HID_CUI_START +  60)
-#define HID_COLORPAGE_LINKSVISITED_LB               (HID_CUI_START +  61)
-#define HID_COLORPAGE_ANCHOR_LB                     (HID_CUI_START +  62)
-#define HID_COLORPAGE_SPELL_LB                      (HID_CUI_START +  63)
-#define HID_COLORPAGE_WRITERTEXTGRID_LB             (HID_CUI_START +  64)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB        (HID_CUI_START +  65)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB          (HID_CUI_START +  66)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB         (HID_CUI_START +  67)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB       (HID_CUI_START +  68)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB      (HID_CUI_START +  69)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB    (HID_CUI_START +  70)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB           (HID_CUI_START +  71)
-#define HID_COLORPAGE_HTMLSGML_LB                   (HID_CUI_START +  72)
-#define HID_COLORPAGE_HTMLCOMMENT_LB                (HID_CUI_START +  73)
-#define HID_COLORPAGE_HTMLKEYWORD_LB                (HID_CUI_START +  74)
-#define HID_COLORPAGE_HTMLUNKNOWN_LB                (HID_CUI_START +  75)
-#define HID_COLORPAGE_CALCGRID_LB                   (HID_CUI_START +  76)
-#define HID_COLORPAGE_CALCPAGEBREAK_LB              (HID_CUI_START +  77)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB        (HID_CUI_START +  78)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB     (HID_CUI_START +  79)
-#define HID_COLORPAGE_CALCDETECTIVE_LB              (HID_CUI_START +  80)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB         (HID_CUI_START +  81)
-#define HID_COLORPAGE_CALCREFERENCE_LB              (HID_CUI_START +  82)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB        (HID_CUI_START +  83)
-#define HID_COLORPAGE_DRAWGRID_LB                   (HID_CUI_START +  84)
-#define HID_COLORPAGE_DRAWDRAWING_LB                (HID_CUI_START +  85)
-#define HID_COLORPAGE_DRAWFILL_LB                   (HID_CUI_START +  86)
-#define HID_COLORPAGE_BASICIDENTIFIER_LB            (HID_CUI_START +  87)
-#define HID_COLORPAGE_BASICCOMMENT_LB               (HID_CUI_START +  88)
-#define HID_COLORPAGE_BASICNUMBER_LB                (HID_CUI_START +  89)
-#define HID_COLORPAGE_BASICSTRING_LB                (HID_CUI_START +  90)
-#define HID_COLORPAGE_BASICOPERATOR_LB              (HID_CUI_START +  91)
-#define HID_COLORPAGE_BASICKEYWORD_LB               (HID_CUI_START +  92)
-#define HID_COLORPAGE_BASICERROR_LB                 (HID_CUI_START +  93)
-#define HID_COLORPAGE_CHECKBOX_START                (HID_CUI_START +  94)
-#define HID_COLORPAGE_DOCCOLOR_CB                   (HID_CUI_START +  94)
-#define HID_COLORPAGE_DOCBOUNDARIES_CB              (HID_CUI_START +  95)
-#define HID_COLORPAGE_APPBACKGROUND_CB              (HID_CUI_START +  96)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB           (HID_CUI_START +  97)
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB            (HID_CUI_START +  98)
-#define HID_COLORPAGE_FONTCOLOR_CB                  (HID_CUI_START +  99)
-#define HID_COLORPAGE_LINKS_CB                      (HID_CUI_START + 100)
-#define HID_COLORPAGE_LINKSVISITED_CB               (HID_CUI_START + 101)
-#define HID_COLORPAGE_ANCHOR_CB                     (HID_CUI_START + 102)
-#define HID_COLORPAGE_SPELL_CB                      (HID_CUI_START + 103)
-#define HID_COLORPAGE_WRITERTEXTGRID_CB             (HID_CUI_START + 104)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB        (HID_CUI_START + 105)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB          (HID_CUI_START + 106)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB         (HID_CUI_START + 107)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB       (HID_CUI_START + 108)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB      (HID_CUI_START + 109)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB    (HID_CUI_START + 110)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB           (HID_CUI_START + 111)
-#define HID_COLORPAGE_HTMLSGML_CB                   (HID_CUI_START + 112)
-#define HID_COLORPAGE_HTMLCOMMENT_CB                (HID_CUI_START + 113)
-#define HID_COLORPAGE_HTMLKEYWORD_CB                (HID_CUI_START + 114)
-#define HID_COLORPAGE_HTMLUNKNOWN_CB                (HID_CUI_START + 115)
-#define HID_COLORPAGE_CALCGRID_CB                   (HID_CUI_START + 116)
-#define HID_COLORPAGE_CALCPAGEBREAK_CB              (HID_CUI_START + 117)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB        (HID_CUI_START + 118)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB     (HID_CUI_START + 119)
-#define HID_COLORPAGE_CALCDETECTIVE_CB              (HID_CUI_START + 120)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB         (HID_CUI_START + 121)
-#define HID_COLORPAGE_CALCREFERENCE_CB              (HID_CUI_START + 122)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB        (HID_CUI_START + 123)
-#define HID_COLORPAGE_DRAWGRID_CB                   (HID_CUI_START + 124)
-#define HID_COLORPAGE_DRAWDRAWING_CB                (HID_CUI_START + 125)
-#define HID_COLORPAGE_DRAWFILL_CB                   (HID_CUI_START + 126)
-#define HID_COLORPAGE_BASICIDENTIFIER_CB            (HID_CUI_START + 127)
-#define HID_COLORPAGE_BASICCOMMENT_CB               (HID_CUI_START + 128)
-#define HID_COLORPAGE_BASICNUMBER_CB                (HID_CUI_START + 129)
-#define HID_COLORPAGE_BASICSTRING_CB                (HID_CUI_START + 130)
-#define HID_COLORPAGE_BASICOPERATOR_CB              (HID_CUI_START + 131)
-#define HID_COLORPAGE_BASICKEYWORD_CB               (HID_CUI_START + 132)
-#define HID_COLORPAGE_BASICERROR_CB                 (HID_CUI_START + 133)
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE          (HID_CUI_START + 134)
-#define HID_SVX_MACRO_LB_EVENT                      (HID_CUI_START + 135)
-#define HID_SVX_CONFIG_EVENT                        (HID_CUI_START + 136)
-#define HID_CONFIG_EVENT_OFFICE_BASED               (HID_CUI_START + 137)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED             (HID_CUI_START + 138)
-#define HID_SELECTOR_DIALOG                         (HID_CUI_START + 139)
-#define HID_SELECTOR_CATEGORIES                     (HID_CUI_START + 140)
-#define HID_SVX_CONFIG_TOOLBAR                      (HID_CUI_START + 141)
-#define HID_SVX_CONFIG_TOOLBAR_CONTENTS             (HID_CUI_START + 142)
-#define HID_SELECTOR_COMMANDS                       (HID_CUI_START + 143)
-#define HID_GALLERY_EDIT_MSNAME                     (HID_CUI_START + 144)
-#define HID_SVX_CONFIG_MENU                         (HID_CUI_START + 145)
-#define HID_SVX_CONFIG_MENU_CONTENTS                (HID_CUI_START + 146)
-#define HID_GALLERY_NEWTHEME_FINDFILES              (HID_CUI_START + 147)
-#define HID_GALLERY_NEWTHEME_ADDFILES               (HID_CUI_START + 148)
-#define HID_HANGULDLG_BUTTON_OPTIONS                (HID_CUI_START + 149)
-#define HID_HANGULDLG_BUTTON_CLOSE                  (HID_CUI_START + 150)
-#define HID_HANGULDLG_BUTTON_IGNORE                 (HID_CUI_START + 151)
-#define HID_HANGULDLG_BUTTON_IGNOREALL              (HID_CUI_START + 152)
-#define HID_HANGULDLG_BUTTON_CHANGE                 (HID_CUI_START + 153)
-#define HID_HANGULDLG_BUTTON_CHANGEALL              (HID_CUI_START + 154)
-#define HID_OFA_FONT_SUBSTITUTION                   (HID_CUI_START + 155)
-#define HID_HANGULDLG_EDIT_NEWWORD                  (HID_CUI_START + 156)
-#define HID_OFA_SUBST_APPLY                         (HID_CUI_START + 157)
-#define HID_OFA_SUBST_DELETE                        (HID_CUI_START + 158)
-#define HID_SPLDLG_BUTTON_CLOSE                     (HID_CUI_START + 159)
-#define HID_SPLDLG_BUTTON_IGNORE                    (HID_CUI_START + 160)
-#define HID_SPLDLG_BUTTON_IGNOREALL                 (HID_CUI_START + 161)
-#define HID_SPLDLG_BUTTON_CHANGE                    (HID_CUI_START + 162)
-#define HID_SPLDLG_BUTTON_CHANGEALL                 (HID_CUI_START + 163)
-#define HID_SPLDLG_BUTTON_EXPLAIN                   (HID_CUI_START + 164)
-#define HID_CHARMAP_CTL_SHOWSET                     (HID_CUI_START + 165)
-#define HID_CHARMAP_CTL_SHOWTEXT                    (HID_CUI_START + 166)
-#define HID_CHARMAP_CTL_SHOWCHAR                    (HID_CUI_START + 167)
-#define HID_DLG_NAME                                (HID_CUI_START + 168)
-#define HID_DLG_MESSBOX                             (HID_CUI_START + 169)
-#define HID_HANGULDLG_SUGGESTIONS                   (HID_CUI_START + 170)
-#define HID_HANGULDLG_SUGGESTIONS_GRID              (HID_CUI_START + 171)
-#define HID_HANGULDLG_SUGGESTIONS_LIST              (HID_CUI_START + 172)
-#define HID_DLG_OBJECT_NAME                         (HID_CUI_START + 173)
-#define HID_DLG_OBJECT_TITLE_DESC                   (HID_CUI_START + 174)
-#define HID_SVX_CONFIG_MENU_ORGANIZER               (HID_CUI_START + 175)
-#define HID_SVX_CONFIG_ICON_SELECTOR                (HID_CUI_START + 176)
-#define HID_SVX_CONFIG_NAME_SUBMENU                 (HID_CUI_START + 177)
-#define HID_SVX_CONFIG_RENAME_MENU                  (HID_CUI_START + 178)
-#define HID_SVX_CONFIG_RENAME_MENU_ITEM             (HID_CUI_START + 179)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR               (HID_CUI_START + 180)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM          (HID_CUI_START + 181)
-#define HID_SVX_NEW_TOOLBAR                         (HID_CUI_START + 182)
-#define HID_SVX_MODIFY_TOOLBAR                      (HID_CUI_START + 183)
-#define HID_SVX_NEW_TOOLBAR_ITEM                    (HID_CUI_START + 184)
-#define HID_SVX_CONFIG_MENU_LISTBOX                 (HID_CUI_START + 185)
-#define HID_SVX_MODIFY_TOOLBAR_ITEM                 (HID_CUI_START + 186)
-#define HID_SVX_SAVE_IN                             (HID_CUI_START + 187)
-#define HID_OPTIONS_MULTIPATH_LIST                  (HID_CUI_START + 188)
-#define HID_FM_DLG_SEARCH                           (HID_CUI_START + 189)
-#define HID_SEARCH_TEXT                             (HID_CUI_START + 190)
-#define HID_SEARCH_ALLFIELDS                        (HID_CUI_START + 191)
-#define HID_GALLERY_PROPERTIES_GENERAL              (HID_CUI_START + 192)
-#define HID_SEARCH_FIELDSELECTION                   (HID_CUI_START + 193)
-#define HID_SEARCH_POSITION                         (HID_CUI_START + 194)
-#define HID_SEARCH_FORMATTER                        (HID_CUI_START + 195)
-#define HID_SEARCH_CASE                             (HID_CUI_START + 196)
-#define HID_SEARCH_BACKWARD                         (HID_CUI_START + 197)
-#define HID_SEARCH_STARTOVER                        (HID_CUI_START + 198)
-#define HID_SEARCH_WILDCARD                         (HID_CUI_START + 199)
-#define HID_SEARCH_REGULAR                          (HID_CUI_START + 200)
-#define HID_SEARCH_APPROX                           (HID_CUI_START + 201)
-#define HID_SEARCH_APPROXSETTINGS                   (HID_CUI_START + 202)
-#define HID_SEARCH_BTN_SEARCH                       (HID_CUI_START + 203)
-#define HID_SEARCH_BTN_CLOSE                        (HID_CUI_START + 204)
-#define HID_GALLERY_BROWSER                         (HID_CUI_START + 205)
-#define HID_GALLERY_SEARCH                          (HID_CUI_START + 206)
-#define HID_GALLERY_APPLY                           (HID_CUI_START + 207)
-#define HID_SPLDLG_BUTTON_IGNORERULE                (HID_CUI_START + 208)
-#define HID_CONFIG_ACCEL                            (HID_CUI_START + 209)
-#define HID_ACCELCONFIG_LISTBOX                     (HID_CUI_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX                 (HID_CUI_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX              (HID_CUI_START + 212)
-#define HID_MACRO_LB_EVENT                          (HID_CUI_START + 213)
-#define HID_MACRO_GROUP                             (HID_CUI_START + 214)
-#define HID_MACRO_MACROS                            (HID_CUI_START + 215)
-#define HID_DIALOG_HANGULHANJA                      (HID_CUI_START + 216)
-#define HID_HANGULHANJA_OPT_DLG                     (HID_CUI_START + 217)
-#define HID_HANGULHANJA_NEWDICT_DLG                 (HID_CUI_START + 218)
-#define HID_HANGULHANJA_EDIT_DLG                    (HID_CUI_START + 219)
-#define HID_HANGULHANJA_OPT_DICTS_LB                (HID_CUI_START + 220)
-#define HID_MULTIPATH                               (HID_CUI_START + 221)
-#define HID_SCRIPTORG_DIALOG                        (HID_CUI_START + 222)
-#define HID_SCRIPTSBOX                              (HID_CUI_START + 223)
-#define HID_SPELLCHECK                              (HID_CUI_START + 224)
-#define HID_TPSIZE_CTRL                             (HID_CUI_START + 225)
-#define HID_TPROTATION_CTRL1                        (HID_CUI_START + 226)
-#define HID_TPROTATION_CTRL2                        (HID_CUI_START + 227)
-#define HID_TRANS_ANGLE                             (HID_CUI_START + 228)
-#define HID_TPPOSITION_CTRL                         (HID_CUI_START + 229)
-#define HID_NUMBERFORMAT_LB_FORMAT                  (HID_CUI_START + 230)
-#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_CUI_START + 231)
-#define HID_TRANS_SLANT                             (HID_CUI_START + 232)
-#define HID_TPHATCH_CTRL                            (HID_CUI_START + 233)
-#define HID_SEARCHATTR_CTL_ATTR                     (HID_CUI_START + 234)
-#define HID_NUMBERFORMAT_TBI_INFO                   (HID_CUI_START + 235)
-#define HID_SEARCHATTR                              (HID_CUI_START + 236)
-#define HID_ALIGNMENT_CTR_DIAL                      (HID_CUI_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK               (HID_CUI_START + 238)
-#define HID_SEARCHSIMILARITY                        (HID_CUI_START + 239)
-#define UID_SEARCH_RECORDSTATUS                     (HID_CUI_START + 240)
-#define HID_OFAPAGE_AUTOCORR_CLB                    (HID_CUI_START + 241)
-#define HID_AUTOCORR_LANGUAGE                       (HID_CUI_START + 242)
-#define HID_OFAPAGE_AUTOFORMAT_CLB                  (HID_CUI_START + 243)
-#define HID_TPCOLOR_RGB_1                           (HID_CUI_START + 244)
-#define HID_TPCOLOR_RGB_2                           (HID_CUI_START + 245)
-#define HID_TPCOLOR_RGB_3                           (HID_CUI_START + 246)
-#define HID_TPCOLOR_CMYK_1                          (HID_CUI_START + 247)
-#define HID_TPCOLOR_CMYK_2                          (HID_CUI_START + 248)
-#define HID_TPCOLOR_CMYK_3                          (HID_CUI_START + 249)
-#define HID_ALIGNMENT                               (HID_CUI_START + 250)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS                (HID_CUI_START + 251)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS                 (HID_CUI_START + 252)
-#define HID_OFAPAGE_AUTOCORR_REPLACE                (HID_CUI_START + 253)
-#define HID_OFACTL_AUTOCORR_REPLACE                 (HID_CUI_START + 254)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT                 (HID_CUI_START + 255)
-#define HID_OFAPAGE_AUTOCORR_QUOTE                  (HID_CUI_START + 256)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS            (HID_CUI_START + 257)
-#define HID_BACKGROUND                              (HID_CUI_START + 258)
-#define HID_BACKGROUND_CTL_BGDCOLORSET              (HID_CUI_START + 259)
-#define HID_BACKGROUND_CTL_POSITION                 (HID_CUI_START + 260)
-#define HID_BORDER                                  (HID_CUI_START + 261)
-#define HID_BORDER_CTL_PRESETS                      (HID_CUI_START + 262)
-#define HID_BORDER_CTL_SHADOWS                      (HID_CUI_START + 263)
-#define HID_PAGE_CONNECTION                         (HID_CUI_START + 264)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW             (HID_CUI_START + 265)
-#define HID_PAGE_DISTRIBUTE                         (HID_CUI_START + 266)
-#define HID_SVXPAGE_GRFCROP                         (HID_CUI_START + 267)
-#define HID_CAPTION                                 (HID_CUI_START + 268)
-#define HID_CAPTION_CTL_TYPE                        (HID_CUI_START + 269)
-#define HID_PAGE_MEASURE                            (HID_CUI_START + 270)
-#define HID_MEASURE_CTL_POSITION                    (HID_CUI_START + 271)
-#define HID_NUMBERFORMAT                            (HID_CUI_START + 272)
-#define HID_NUMBERFORMAT_TBI_ADD                    (HID_CUI_START + 273)
-#define HID_NUMBERFORMAT_TBI_REMOVE                 (HID_CUI_START + 274)
-#define HID_FORMAT_PAGE                             (HID_CUI_START + 275)
-#define HID_REDLINING_DLG                           (HID_CUI_START + 276)
-#define HID_REDLINING_EDIT                          (HID_CUI_START + 277)
-#define HID_REDLINING_PREV                          (HID_CUI_START + 278)
-#define HID_REDLINING_NEXT                          (HID_CUI_START + 279)
-#define HID_FORMAT_PARAGRAPH_STD                    (HID_CUI_START + 280)
-#define HID_VALUESET_SINGLENUM                      (HID_CUI_START + 281)
-#define HID_VALUESET_BULLET                         (HID_CUI_START + 282)
-#define HID_VALUESET_NUM                            (HID_CUI_START + 283)
-#define HID_VALUESET_NUMBMP                         (HID_CUI_START + 284)
-#define HID_SVXPAGE_PICK_NUM                        (HID_CUI_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM                 (HID_CUI_START + 286)
-#define HID_SVXPAGE_PICK_BMP                        (HID_CUI_START + 287)
-#define HID_SVXPAGE_PICK_BULLET                     (HID_CUI_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS                     (HID_CUI_START + 289)
-#define HID_SVXPAGE_NUM_POSITION                    (HID_CUI_START + 290)
-#define HID_MEASURE_CTL_PREVIEW                     (HID_CUI_START + 291)
-#define HID_FORMAT_PARAGRAPH_EXT                    (HID_CUI_START + 292)
-#define HID_FORMAT_PARAGRAPH_ALIGN                  (HID_CUI_START + 293)
-#define HID_SVXPAGE_PARA_ASIAN                      (HID_CUI_START + 294)
-#define HID_SVXPAGE_SWPOSSIZE                       (HID_CUI_START + 295)
-#define HID_AREA_TRANSPARENCE                       (HID_CUI_START + 296)
-#define HID_AREA_AREA                               (HID_CUI_START + 297)
-#define HID_AREA_SHADOW                             (HID_CUI_START + 298)
-#define HID_AREA_HATCH                              (HID_CUI_START + 299)
-#define HID_AREA_BITMAP                             (HID_CUI_START + 300)
-#define HID_TPSHADOW_CTRL                           (HID_CUI_START + 301)
-#define HID_AREA_GRADIENT                           (HID_CUI_START + 302)
-#define HID_LINE_ENDDEF                             (HID_CUI_START + 303)
-#define HID_LINE_LINE                               (HID_CUI_START + 304)
-#define HID_LINE_DEF                                (HID_CUI_START + 305)
-#define HID_SPELLDLG_SETWORD                        (HID_CUI_START + 306)
-#define HID_TABULATOR                               (HID_CUI_START + 307)
-#define HID_PAGE_TEXTATTR                           (HID_CUI_START + 308)
-#define HID_TEXTATTR_CTL_POSITION                   (HID_CUI_START + 309)
-#define HID_TRANS_POSITION_SIZE                     (HID_CUI_START + 310)
-#define HID_HYPHENATE                               (HID_CUI_START + 311)
-#define HID_SVXPAGE_CHAR_NAME                       (HID_CUI_START + 312)
-#define HID_SVXPAGE_CHAR_EFFECTS                    (HID_CUI_START + 313)
-#define HID_SVXPAGE_CHAR_POSITION                   (HID_CUI_START + 314)
-#define HID_HYPERLINK_INTERNET                      (HID_CUI_START + 315)
-#define HID_HYPERLINK_MAIL                          (HID_CUI_START + 316)
-#define HID_HYPERLINK_DOCUMENT                      (HID_CUI_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT                   (HID_CUI_START + 318)
-#define HID_HYPERLINK_MARKWND                       (HID_CUI_START + 319)
-#define HID_ICCDIALOG_RESET_BTN                     (HID_CUI_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL                    (HID_CUI_START + 321)
-#define HID_HYPERDLG_INET_PATH                      (HID_CUI_START + 322)
-#define HID_HYPERDLG_MAIL_PATH                      (HID_CUI_START + 323)
-#define HID_HYPERDLG_DOC_PATH                       (HID_CUI_START + 324)
-#define HID_ICCDIALOG_OK_BTN                        (HID_CUI_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN                    (HID_CUI_START + 326)
-#define HID_HYPERLINK_MARKWND_APPLY                 (HID_CUI_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE                 (HID_CUI_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE                  (HID_CUI_START + 329)
-#define HID_SVXPAGE_CHAR_TWOLINES                   (HID_CUI_START + 330)
-#define HID_GRFFILTER_EMBOSS_LIGHT                  (HID_CUI_START + 331)
-#define HID_PASTE_DLG                               (HID_CUI_START + 333)
-#define HID_LINKDLG_TABLB                           (HID_CUI_START + 334)
-#define HID_MACRO_HEADERTABLISTBOX                  (HID_CUI_START + 335)
-#define HID_GALLERY_ENTER_TITLE                     (HID_CUI_START + 336)
-#define HID_GALLERY_TITLE_EDIT                      (HID_CUI_START + 337)
-#define HID_THES_LANGUAGE                           (HID_CUI_START + 338)
-#define HID_OFAPAGE_QUOTE_SW_CLB                    (HID_CUI_START + 339)
-#define HID_OFAPAGE_QUOTE_CLB                       (HID_CUI_START + 340)
-#define HID_CT_THES_ALTERNATIVES                    (HID_CUI_START + 341)
+#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR"
+#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
+#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
+#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
+#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
+#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL"
+#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
+#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
+#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET"
+#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
+#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL"
+#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY"
+#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH"
+#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL"
+#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
+#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
+#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
+#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES"
+#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS"
+#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
+#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
+#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG"
+#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
+#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG"
+#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN"
+#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
+#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
+#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA"
+#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST"
+#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
+#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
+#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
+#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
+#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE"
+#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS"
+#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
+#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
+#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
+#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
+#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC"
+#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW"
+#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES"
+#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY"
+#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
+#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
+#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS"
+#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB"
+#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH"
+#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
+#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO"
+#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
+#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR"
+#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE"
+#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
+#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB"
+#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB"
+#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB"
+#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB"
+#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB"
+#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB"
+#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB"
+#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
+#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
+#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
+#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB"
+#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB"
+#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB"
+#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB"
+#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB"
+#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB"
+#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB"
+#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB"
+#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB"
+#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB"
+#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB"
+#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB"
+#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB"
+#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
+#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
+#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
+#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
+#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
+#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB"
+#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB"
+#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB"
+#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB"
+#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB"
+#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB"
+#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
+#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
+#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
+#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB"
+#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB"
+#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB"
+#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB"
+#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB"
+#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB"
+#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB"
+#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB"
+#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB"
+#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB"
+#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB"
+#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB"
+#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB"
+#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
+#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
+#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
+#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
+#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT"
+#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
+#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG"
+#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES"
+#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
+#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
+#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS"
+#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME"
+#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU"
+#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS"
+#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES"
+#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES"
+#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS"
+#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE"
+#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE"
+#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL"
+#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
+#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
+#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION"
+#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
+#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY"
+#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE"
+#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE"
+#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE"
+#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL"
+#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE"
+#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL"
+#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN"
+#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
+#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
+#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
+#define HID_DLG_NAME "CUI_HID_DLG_NAME"
+#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX"
+#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
+#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
+#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
+#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME"
+#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC"
+#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER"
+#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR"
+#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU"
+#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU"
+#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"
+#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR"
+#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR"
+#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM"
+#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX"
+#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM"
+#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
+#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
+#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH"
+#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT"
+#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS"
+#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL"
+#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION"
+#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION"
+#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER"
+#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE"
+#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD"
+#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER"
+#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD"
+#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR"
+#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX"
+#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS"
+#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH"
+#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
+#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER"
+#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH"
+#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY"
+#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE"
+#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL"
+#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX"
+#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX"
+#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX"
+#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT"
+#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP"
+#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS"
+#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
+#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG"
+#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG"
+#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
+#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
+#define HID_MULTIPATH "CUI_HID_MULTIPATH"
+#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG"
+#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX"
+#define HID_SPELLCHECK "CUI_HID_SPELLCHECK"
+#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL"
+#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
+#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"
+#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE"
+#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL"
+#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT"
+#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW"
+#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT"
+#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
+#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR"
+#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO"
+#define HID_SEARCHATTR "CUI_HID_SEARCHATTR"
+#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL"
+#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK"
+#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
+#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
+#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
+#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
+#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
+#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
+#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
+#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3"
+#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1"
+#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2"
+#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
+#define HID_ALIGNMENT "CUI_HID_ALIGNMENT"
+#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
+#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
+#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE"
+#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE"
+#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
+#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
+#define HID_BACKGROUND "CUI_HID_BACKGROUND"
+#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET"
+#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION"
+#define HID_BORDER "CUI_HID_BORDER"
+#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS"
+#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS"
+#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
+#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW"
+#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
+#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP"
+#define HID_CAPTION "CUI_HID_CAPTION"
+#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE"
+#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE"
+#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
+#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT"
+#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD"
+#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE"
+#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE"
+#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG"
+#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT"
+#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV"
+#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT"
+#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
+#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM"
+#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET"
+#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
+#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
+#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM"
+#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM"
+#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP"
+#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET"
+#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
+#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION"
+#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
+#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
+#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
+#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN"
+#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
+#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
+#define HID_AREA_AREA "CUI_HID_AREA_AREA"
+#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
+#define HID_AREA_HATCH "CUI_HID_AREA_HATCH"
+#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
+#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
+#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT"
+#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
+#define HID_LINE_LINE "CUI_HID_LINE_LINE"
+#define HID_LINE_DEF "CUI_HID_LINE_DEF"
+#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
+#define HID_TABULATOR "CUI_HID_TABULATOR"
+#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
+#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
+#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
+#define HID_HYPHENATE "CUI_HID_HYPHENATE"
+#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
+#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS"
+#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION"
+#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
+#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
+#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT"
+#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT"
+#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND"
+#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN"
+#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL"
+#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH"
+#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH"
+#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH"
+#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN"
+#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN"
+#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
+#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
+#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
+#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES"
+#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
+#define HID_PASTE_DLG "CUI_HID_PASTE_DLG"
+#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
+#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
+#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE"
+#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
+#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE"
+#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB"
+#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB"
+#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG"
+#define HID_CT_THES_ALTERNATIVES                    "CUI_HID_CT_THES_ALTERNATIVES"
 
-// please adjust ACT_CUI_HID_END below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_CUI_HID_END     HID_CUI_START + 341
-
-#if ACT_CUI_HID_END > HID_CUI_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY                             "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN            "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN    "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE                        "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY               "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY          "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY  "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY"
+#define HID_HYPERLINK_DIALOG                                        "CUI_HID_HYPERLINK_DIALOG"
 
 #endif
 
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index edfc790afc0d..9859fc9c0f80 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -53,8 +53,6 @@ private:
     DECL_LINK (ClickNewHdl_Impl          , void * );        // Button : New
 
     Image GetImage( USHORT nId );
-    void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL );
-    //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile );
 
 protected:
     void FillDlgFields     ( String& aStrURL );
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index f4646daf376e..35f010583fb9 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -116,8 +116,6 @@ protected :
 
     USHORT              GetSlot( USHORT nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
     USHORT              GetWhich( USHORT nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
-    const SfxPoolItem*  GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
-    const SfxPoolItem*  GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
 
 public :
     virtual             ~IconChoicePage();
@@ -148,8 +146,6 @@ public :
     virtual BOOL        IsReadOnly() const;
     virtual sal_Bool    QueryClose();
 
-    static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
-
     void                StateChanged( StateChangedType nType );
     void                DataChanged( const DataChangedEvent& rDCEvt );
 };
@@ -221,7 +217,6 @@ protected :
     void                    ResetPageImpl ();
 
     short                   Ok();
-    BOOL                    IsInOK() const;
 
 public :
 
@@ -242,17 +237,10 @@ public :
     //
 
     SvxIconChoiceCtrlEntry* AddTabPage(
-        USHORT nId, const String& rIconText, const Image& rChoiceIcon,
-        CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
-    SvxIconChoiceCtrlEntry* AddTabPage(
         USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
 
-    void                RemoveTabPage( USHORT nId );
-
     void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
     USHORT              GetCurPageId() const       { return mnCurrentPageId; }
     void                ShowPage( USHORT nId );
@@ -261,8 +249,6 @@ public :
     const USHORT*       GetInputRanges( const SfxItemPool& );
     void                SetInputSet( const SfxItemSet* pInSet );
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
-    const SfxItemSet*   GetOutputItemSet( USHORT nId );
-    int                 FillOutputItemSet();
 
     const OKButton&     GetOKButton() const { return aOKBtn; }
     OKButton&           GetOKButton() { return aOKBtn; }
@@ -271,18 +257,13 @@ public :
     const HelpButton&   GetHelpButton() const { return aHelpBtn; }
     HelpButton&         GetHelpButton() { return aHelpBtn; }
 
-    void                RemoveResetButton();
-
     short               Execute();
     void                Start( BOOL bShow = TRUE );
     sal_Bool            QueryClose();
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
 
-    void                SetCtrlColor ( const Color& rColor );
     EIconChoicePos      SetCtrlPos   ( const EIconChoicePos& rPos );
-
-    void                CreateIconTextAutoMnemonics( void );
 };
 
 #endif //_ICCDLG_HXX
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 299e784ae191..a93b93498d37 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -89,8 +89,6 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
     BOOL                IsCreateNew() const { return aRbNewObject.IsChecked(); }
 
 public:
-    static void         FillObjectServerList( SvObjectServerList* );
-
                         SvInsertOleDlg( Window* pParent,
                             const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
                             const SvObjectServerList* pServers = NULL );
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index b0c678009093..f75ab2471923 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
     bool            bColumn;
 
 public:
-    SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
+    SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
 
     virtual short Execute(void);
 
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index d6a2b607eac3..45cf2fdbf79e 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -60,7 +60,6 @@ class _SfxMacroTabPage : public SfxTabPage
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
 
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
     DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
 
 protected:
@@ -86,19 +85,11 @@ public:
     virtual void                ScriptChanged( const String& rLanguage );
     virtual void                PageCreated (SfxAllItemSet aSet);
 
-    // zum setzen / abfragen der Links
-    void                        SetGetRangeLink( FNGetRangeHdl pFn );
-    FNGetRangeHdl               GetGetRangeLink() const;
-    void                        SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
-    FNGetMacrosOfRangeHdl       GetGetMacrosOfRangeLink() const;
-
     // --------- Erben aus der Basis -------------
     virtual BOOL                FillItemSet( SfxItemSet& rSet );
     virtual void                Reset( const SfxItemSet& rSet );
 
-    void                        SetReadOnly( BOOL bSet );
     BOOL                        IsReadOnly() const;
-    void                        SelectEvent( const String& rEventName, USHORT nEventId );
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index e7259f2a682c..266c51944b09 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -36,14 +36,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
 
-// class SvxEmptyPage ----------------------------------------------------
-
-class SvxEmptyPage : public TabPage
-{
-public:
-    SvxEmptyPage( Window* pParent );
-};
-
 // class SvxImprovementPage ----------------------------------------------
 
 class SvxImprovementPage : public TabPage
@@ -105,7 +97,6 @@ public:
     virtual             ~SvxImprovementOptionsPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static sal_uInt16*  GetRanges();
 
     virtual sal_Bool    FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
@@ -123,16 +114,5 @@ public:
     SvxImprovementDialog( Window* pParent, const String& rInfoURL );
 };
 
-class SvxInfoWindow : public Window
-{
-private:
-    FixedText   m_aInfoText;
-
-public:
-    SvxInfoWindow( Window* pParent, const ResId& rResId );
-
-    void        SetInfoText( const String& rText );
-};
-
 #endif
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 82752a7af01a..64a926f5ef89 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -135,7 +135,6 @@ public:
 
 
     void                    SetPageWidth( USHORT nPageWidth );
-    void                    SetMaxDistance( USHORT nMaxDist );
     void                    EnableRelativeMode();
     void                    EnableRegisterMode();
     void                    EnableAutoFirstLine();
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
new file mode 100644
index 000000000000..337c9b84da11
--- /dev/null
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _CUI_PASSWDOMDLG_HXX_
+#define _CUI_PASSWDOMDLG_HXX_
+
+
+#include <sfx2/basedlgs.hxx>
+
+#include <memory>
+
+//////////////////////////////////////////////////////////////////////
+
+struct PasswordToOpenModifyDialog_Impl;
+
+class PasswordToOpenModifyDialog : public SfxModalDialog
+{
+    std::auto_ptr< PasswordToOpenModifyDialog_Impl >  m_pImpl;
+
+    // disallow use of copy c-tor and assignment operator
+    PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & );
+    PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & );
+
+public:
+    PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen,
+            sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
+            bool bIsPasswordToModify );
+    virtual ~PasswordToOpenModifyDialog();
+
+    // AbstractPasswordToOpenModifyDialog
+    virtual String  GetPasswordToOpen() const;
+    virtual String  GetPasswordToModify() const;
+    virtual bool    IsRecommendToOpenReadonly() const;
+};
+
+//////////////////////////////////////////////////////////////////////
+
+#endif
+
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 0b8930c57827..8ecdd93a5d2e 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -97,13 +97,7 @@ protected:
     void                    ExpandTree( SvLBoxEntry* pRootEntry );
     virtual void            RequestingChilds( SvLBoxEntry* pParent );
     virtual void            ExpandedHdl();
-    SvLBoxEntry*            FindEntry( SvLBoxEntry* pParent, const String& rText, BYTE nType );
     virtual long            ExpandingHdl();
-    static BOOL             dialogSort1( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
-            com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-    static BOOL             dialogSort2( com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node1,
-            com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node2 );
-
 public:
     void                    Init( const ::rtl::OUString& language );
     void  RequestSubEntries(  SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
@@ -111,8 +105,6 @@ public:
                     SFTreeListBox( Window* pParent, const ResId& rRes );
                     ~SFTreeListBox();
 
-    void            UpdateEntries();
-
     void            ExpandAllTrees();
 
 
@@ -202,15 +194,12 @@ protected:
     BOOL                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
     void                CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
-
     void        createEntry( SvLBoxEntry* pEntry );
     void        renameEntry( SvLBoxEntry* pEntry );
     void        deleteEntry( SvLBoxEntry* pEntry );
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
                 getBrowseNode( SvLBoxEntry* pEntry );
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
-    void        EnableButton( Button& rButton, BOOL bEnable );
     String      getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
     void        StoreCurrentSelection();
     void        RestorePreviousSelection();
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 104cc928071e..3c01b955a474 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -115,13 +115,8 @@ public:
                                     SvxConfigFunctionListBox_Impl( Window*, const ResId& );
                                     ~SvxConfigFunctionListBox_Impl();
     void                            ClearAll();
-    SvLBoxEntry*                    GetEntry_Impl( USHORT nId );
-    SvLBoxEntry*                    GetEntry_Impl( const String& );
-    USHORT                          GetId( SvLBoxEntry *pEntry );
     String                          GetHelpText( SvLBoxEntry *pEntry );
     using Window::GetHelpText;
-    USHORT                          GetCurId()
-                                    { return GetId( FirstSelected() ); }
     SvLBoxEntry*                    GetLastSelectedEntry();
     void                            FunctionSelected();
 
@@ -235,7 +230,6 @@ public:
     void        SetImageProvider( ImageProvider* provider )
         { aCategories.SetImageProvider( provider ); }
 
-    USHORT      GetSelectedId();
     String      GetScriptURL() const;
     String      GetSelectedDisplayName();
     String      GetSelectedHelpText();
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 72fb9d4d61f6..72859aa70945 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -336,12 +336,6 @@ private:
 
 public:
     ExtensionsTabPage(
-        Window* pParent, const ResId&,
-        const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
-        const com::sun::star::uno::Reference<
-            com::sun::star::awt::XContainerWindowProvider >& rProvider );
-
-    ExtensionsTabPage(
         Window* pParent, WinBits nStyle,
         const rtl::OUString& rPageURL, const rtl::OUString& rEvtHdl,
         const com::sun::star::uno::Reference<
@@ -354,6 +348,5 @@ public:
 
     void            ResetPage();
     void            SavePage();
-    void            HideWindow();
 };
 
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 5b494a0448b3..9a8c9b03da1c 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -99,16 +99,13 @@ public:
     SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxZoomDialog();
 
-    static USHORT*      GetRanges();
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
     USHORT              GetFactor() const;
     void                SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
 
-    void                SetButtonText( USHORT nBtnId, const String& aNewTxt );
     void                HideButton( USHORT nBtnId );
     void                SetLimits( USHORT nMin, USHORT nMax );
-    void                SetSpinSize( USHORT nNewSpin );
 };
 
 #include <layout/layout-post.hxx>
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index 08e4f2043a40..89b45595b37a 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -35,7 +35,7 @@
 
 TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 {
-     // HelpId = ;
+    HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
     SVLook = TRUE ;
@@ -49,6 +49,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     CheckBox CB_POOL_CONNS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS";
         Pos = MAP_APPFONT( 7, 15 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 14, 10 );
         Text [ en-US ] = "Connection pooling enabled";
@@ -80,6 +81,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     CheckBox CB_DRIVERPOOLING
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING";
         Pos = MAP_APPFONT( 17, 39 + LIST_SIZE_Y + 4 + 8 + 3 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 23, 10 );
         Text [ en-US ] = "Enable pooling for this driver";
@@ -92,6 +94,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     NumericField NF_TIMEOUT
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT";
         Pos = MAP_APPFONT( 27 + 100 + 3, 39 + LIST_SIZE_Y + 4 + 8 + 3 + 10 + 3 );
         Size = MAP_APPFONT( 40, 12 );
         SvLook = TRUE;
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index f17b805000f9..ae01a4f08f27 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -39,13 +39,6 @@ namespace offapp
     //= DriverPooling
     //====================================================================
     //--------------------------------------------------------------------
-    DriverPooling::DriverPooling()
-        :bEnabled(sal_False)
-        ,nTimeoutSeconds(0)
-    {
-    }
-
-    //--------------------------------------------------------------------
     DriverPooling::DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout )
         :sName(_rName)
         ,bEnabled(_bEnabled)
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 666b74742190..4a835d15a728 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -46,7 +46,6 @@ namespace offapp
         sal_Bool            bEnabled;
         sal_Int32           nTimeoutSeconds;
 
-        DriverPooling();
         DriverPooling( const String& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout );
 
         sal_Bool operator == (const DriverPooling& _rR) const;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 7d488c263bad..ad34722ae246 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -92,9 +92,3 @@ INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
 {
     return pPage->GetTransliterationFlags();
 }
-
-
-void SvxJSearchOptionsDialog::SetTransliterationFlags( INT32 nSettings )
-{
-    pPage->SetTransliterationFlags( nSettings );
-}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index c617a3e4c515..7bfc72d1181e 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -425,60 +425,6 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co
 }
 
 // -----------------------------------------------------------------------------
-String DbRegistrationOptionsPage::getFileLocation(const String& _sLocation)
-{
-    try
-    {
-        rtl::OUString aService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) );
-        Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-        Reference < XFilePicker > xFilePicker( xFactory->createInstance( aService ), UNO_QUERY );
-        OSL_ENSURE(xFilePicker.is() ,"Could create file picker service!");
-        Reference < XFilterManager> xFilterManager(xFilePicker,UNO_QUERY);
-        static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
-        const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
-        if ( pFilter )
-        {
-            xFilterManager->appendFilter( pFilter->GetUIName(),pFilter->GetDefaultExtension());
-            xFilterManager->setCurrentFilter(pFilter->GetUIName());
-        }
-
-        INetURLObject aURL( _sLocation, INET_PROT_FILE );
-        xFilePicker->setMultiSelectionMode(sal_False);
-        xFilePicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
-        short nRet = xFilePicker->execute();
-
-        if ( ExecutableDialogResults::OK == nRet )
-        {
-
-            // old path is an URL?
-            INetURLObject aObj( _sLocation );
-            FASTBOOL bURL = ( aObj.GetProtocol() != INET_PROT_NOT_VALID );
-            Sequence< ::rtl::OUString > aFiles = xFilePicker->getFiles();
-            INetURLObject aNewObj( aFiles[0] );
-            aNewObj.removeFinalSlash();
-
-            // then the new path also an URL else system path
-            String sNewLocation = bURL ? rtl::OUString(aFiles[0]) : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT );
-
-            if (
-#ifdef UNX
-    // Unix is case sensitive
-                                ( sNewLocation != _sLocation )
-#else
-                                ( sNewLocation.CompareIgnoreCaseToAscii( _sLocation ) != COMPARE_EQUAL )
-#endif
-            )
-                return sNewLocation;
-        }
-    }
-    catch( Exception& )
-    {
-        DBG_ERRORFILE( "DbRegistrationOptionsPage::EditLocationHdl: exception from folder picker" );
-    }
-
-    return String();
-}
-// -----------------------------------------------------------------------------
 void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry)
 {
     ODocumentLinkDialog aDlg(this,_pEntry == NULL);
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 444d4faac22d..e2ad56ceedd0 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -34,7 +34,7 @@
 #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
 TabPage RID_SFXPAGE_DBREGISTER
 {
-    // HelpId = HID_OPTIONS_DBREGISTER ;
+    HelpId = "cui:TabPage:RID_SFXPAGE_DBREGISTER" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -64,18 +64,21 @@ TabPage RID_SFXPAGE_DBREGISTER
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW";
         Pos = MAP_APPFONT ( 47 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~New..." ;
     };
     PushButton BTN_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT";
         Pos = MAP_APPFONT ( 183 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE";
         Pos = MAP_APPFONT ( 115 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index f61f23092f37..f421afc56fe0 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -46,6 +46,7 @@
 
 ModalDialog DLG_DOCUMENTLINK
 {
+    HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -64,6 +65,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     ComboBox CMB_URL
     {
+        HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL";
         Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
 
@@ -75,6 +77,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     PushButton PB_BROWSEFILE
     {
+        HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE";
         Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ;
         Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "~Browse...";
@@ -90,6 +93,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     Edit ET_NAME
     {
+        HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME";
         Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 1b5f3298913e..034874388369 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -49,6 +49,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_USETABLE
     {
+        HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         TabStop = TRUE ;
@@ -63,6 +64,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ComboBox CB_FONT1
     {
+        HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 33 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -82,6 +84,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ComboBox CB_FONT2
     {
+        HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 110 , 33 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -145,6 +148,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ListBox LB_FONTNAME
     {
+        HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME";
         Pos = MAP_APPFONT ( 65 , 140 ) ;
         Size = MAP_APPFONT ( 100 , 68 ) ;
         Border = TRUE ;
@@ -153,6 +157,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     CheckBox  CB_NONPROP
     {
+        HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP";
         Pos = MAP_APPFONT ( 65 , 155 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -166,6 +171,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ListBox LB_FONTHEIGHT
     {
+        HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT";
         Pos = MAP_APPFONT ( 65 , 169 ) ;
         Size = MAP_APPFONT ( 30 , 68 ) ;
         Border = TRUE ;
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index 3acd1ac2766c..b4caafc0feea 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -32,6 +32,7 @@
 
 TabPage RID_OFA_TP_INTERNATIONAL
 {
+    HelpID = "cui:TabPage:RID_OFA_TP_INTERNATIONAL";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
     SVLook = TRUE ;
@@ -46,6 +47,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     RadioButton RB_TXTDIR_LEFT2RIGHT
     {
+        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT";
         Pos = MAP_APPFONT( COL_1, ROW_1 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
         Group = TRUE;
@@ -54,6 +56,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     RadioButton RB_TXTDIR_RIGHT2LEFT
     {
+        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT";
         Pos = MAP_APPFONT( COL_1, ROW_2 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
         Text [ en-US ] = "~Right-to-left";
@@ -68,6 +71,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     CheckBox CB_SHTVW_RIGHT2LEFT
     {
+        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT";
         Pos = MAP_APPFONT( COL_1, ROW_4 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB );
         Text [ en-US ] = "Right-~to-left";
@@ -75,6 +79,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     CheckBox CB_SHTVW_CURRENTDOCONLY
     {
+        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY";
         Pos = MAP_APPFONT( COL_2, ROW_5 );
         Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB );
         Text [ en-US ] = "~Current document only";
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 4d7e1985d838..a9a5ad16869d 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -44,6 +44,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ACCESSIBILITY_TOOL
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_1 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_TEXTSELECTION
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_2 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -59,6 +61,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ANIMATED_GRAPHICS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_3 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -66,6 +69,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ANIMATED_TEXTS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_4 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -73,6 +77,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_TIPHELP
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) );
         Size = MAP_APPFONT( DIFF(COL2,COL3), RSC_CD_CHECKBOX_HEIGHT );
@@ -80,6 +85,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     NumericField NF_TIPHELP
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROWA_5 );
@@ -105,6 +111,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_AUTO_DETECT_HC
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_1 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_AUTOMATIC_FONT_COLOR
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_2 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -119,6 +127,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_PAGE_PREVIEWS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_3 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index c9a2c9606c98..d9c81f5b9a6a 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -45,12 +45,14 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     RadioButton RB_CHAR_KERNING
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~Western characters only";
     };
     RadioButton RB_CHAR_PUNCT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT";
         Pos = MAP_APPFONT ( 12, 27 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "Western ~text and Asian punctuation";
@@ -63,18 +65,21 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     RadioButton RB_NO_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP";
         Pos = MAP_APPFONT ( 12, 54 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~No compression";
     };
     RadioButton RB_PUNCT_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP";
         Pos = MAP_APPFONT ( 12, 67) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~Compress punctuation only";
     };
     RadioButton RB_PUNCT_KANA_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP";
         Pos = MAP_APPFONT ( 12, 80 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "Compress ~punctuation and Japanese Kana";
@@ -93,6 +98,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE";
         Pos = MAP_APPFONT ( 95 , 107 ) ;
         Size = MAP_APPFONT ( 80 , 48 ) ;
         Border = TRUE ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD";
         Pos = MAP_APPFONT ( 180, 109 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "~Default";
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     Edit ED_START
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START";
         Pos = MAP_APPFONT ( 95 , 123 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
@@ -124,6 +132,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     Edit ED_END
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END";
         Pos = MAP_APPFONT ( 95 , 139 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 374828b329c1..af2d7444612a 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -46,6 +46,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
     };
     ListBox LB_CHART_COLOR_LIST
     {
+        HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST";
         Border      = TRUE;
         Pos         = MAP_APPFONT ( 12 , 15  );
         Size        = MAP_APPFONT ( 68 , 152 );
@@ -68,6 +69,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
     };
     PushButton PB_RESET_TO_DEFAULT
     {
+        HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT";
         Pos = MAP_APPFONT ( 204 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Default";
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 90befc998e01..ff10e2744533 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -60,6 +60,94 @@ using namespace ::svtools;
 #define GROUP_BASIC     5
 #define GROUP_SQL       6
 
+const char* aColorLBHids[] =
+{
+     HID_COLORPAGE_DOCCOLOR_LB,
+     HID_COLORPAGE_DOCBOUNDARIES_LB,
+     HID_COLORPAGE_APPBACKGROUND_LB,
+     HID_COLORPAGE_OBJECTBOUNDARIES_LB,
+     HID_COLORPAGE_TABLEBOUNDARIES_LB,
+     HID_COLORPAGE_FONTCOLOR_LB,
+     HID_COLORPAGE_LINKS_LB,
+     HID_COLORPAGE_LINKSVISITED_LB,
+     HID_COLORPAGE_ANCHOR_LB,
+     HID_COLORPAGE_SPELL_LB,
+     HID_COLORPAGE_WRITERTEXTGRID_LB,
+     HID_COLORPAGE_WRITERFIELDSHADINGS_LB,
+     HID_COLORPAGE_WRITERIDXSHADINGS_LB,
+     HID_COLORPAGE_WRITERDIRECTCURSOR_LB,
+     HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
+     HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
+     HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
+     HID_COLORPAGE_WRITERPAGEBREAKS_LB,
+     HID_COLORPAGE_HTMLSGML_LB,
+     HID_COLORPAGE_HTMLCOMMENT_LB,
+     HID_COLORPAGE_HTMLKEYWORD_LB,
+     HID_COLORPAGE_HTMLUNKNOWN_LB,
+     HID_COLORPAGE_CALCGRID_LB,
+     HID_COLORPAGE_CALCPAGEBREAK_LB,
+     HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB,
+     HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB,
+     HID_COLORPAGE_CALCDETECTIVE_LB,
+     HID_COLORPAGE_CALCDETECTIVEERROR_LB,
+     HID_COLORPAGE_CALCREFERENCE_LB,
+     HID_COLORPAGE_CALCNOTESBACKGROUND_LB,
+     HID_COLORPAGE_DRAWGRID_LB,
+     HID_COLORPAGE_DRAWDRAWING_LB,
+     HID_COLORPAGE_DRAWFILL_LB,
+     HID_COLORPAGE_BASICIDENTIFIER_LB,
+     HID_COLORPAGE_BASICCOMMENT_LB,
+     HID_COLORPAGE_BASICNUMBER_LB,
+     HID_COLORPAGE_BASICSTRING_LB,
+     HID_COLORPAGE_BASICOPERATOR_LB,
+     HID_COLORPAGE_BASICKEYWORD_LB,
+     HID_COLORPAGE_BASICERROR_LB
+};
+
+const char* aColorCBHids[] =
+{
+     HID_COLORPAGE_DOCCOLOR_CB,
+     HID_COLORPAGE_DOCBOUNDARIES_CB,
+     HID_COLORPAGE_APPBACKGROUND_CB,
+     HID_COLORPAGE_OBJECTBOUNDARIES_CB,
+     HID_COLORPAGE_TABLEBOUNDARIES_CB,
+     HID_COLORPAGE_FONTCOLOR_CB,
+     HID_COLORPAGE_LINKS_CB,
+     HID_COLORPAGE_LINKSVISITED_CB,
+     HID_COLORPAGE_ANCHOR_CB,
+     HID_COLORPAGE_SPELL_CB,
+     HID_COLORPAGE_WRITERTEXTGRID_CB,
+     HID_COLORPAGE_WRITERFIELDSHADINGS_CB,
+     HID_COLORPAGE_WRITERIDXSHADINGS_CB,
+     HID_COLORPAGE_WRITERDIRECTCURSOR_CB,
+     HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
+     HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
+     HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
+     HID_COLORPAGE_WRITERPAGEBREAKS_CB,
+     HID_COLORPAGE_HTMLSGML_CB,
+     HID_COLORPAGE_HTMLCOMMENT_CB,
+     HID_COLORPAGE_HTMLKEYWORD_CB,
+     HID_COLORPAGE_HTMLUNKNOWN_CB,
+     HID_COLORPAGE_CALCGRID_CB,
+     HID_COLORPAGE_CALCPAGEBREAK_CB,
+     HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB,
+     HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB,
+     HID_COLORPAGE_CALCDETECTIVE_CB,
+     HID_COLORPAGE_CALCDETECTIVEERROR_CB,
+     HID_COLORPAGE_CALCREFERENCE_CB,
+     HID_COLORPAGE_CALCNOTESBACKGROUND_CB,
+     HID_COLORPAGE_DRAWGRID_CB,
+     HID_COLORPAGE_DRAWDRAWING_CB,
+     HID_COLORPAGE_DRAWFILL_CB,
+     HID_COLORPAGE_BASICIDENTIFIER_CB,
+     HID_COLORPAGE_BASICCOMMENT_CB,
+     HID_COLORPAGE_BASICNUMBER_CB,
+     HID_COLORPAGE_BASICSTRING_CB,
+     HID_COLORPAGE_BASICOPERATOR_CB,
+     HID_COLORPAGE_BASICKEYWORD_CB,
+     HID_COLORPAGE_BASICERROR_CB
+};
+
 /* -----------------------------2002/06/26 10:48------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -815,7 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
             else
                 aCheckBoxes[i]->Hide();
             aCheckBoxes[i]->SetBackground(aTransparentWall);
-            aCheckBoxes[i]->SetHelpId(HID_COLORPAGE_CHECKBOX_START + i);
+            aCheckBoxes[i]->SetHelpId( aColorCBHids[i] );
             if(bSetTextColor)
                 aCheckBoxes[i]->SetTextColor(aRCheckCol);
         }
@@ -854,13 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
         XColorEntry* pEntry = aColorTable.GetColor(i);
         aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
     }
-    aColorBoxes[0]->SetHelpId(HID_COLORPAGE_LISTBOX_START);
+
+    aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
+
     for( sal_Int32 i = 1; i < nCount; i++ )
     {
         if(aColorBoxes[i])
         {
             aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
-            aColorBoxes[i]->SetHelpId(HID_COLORPAGE_LISTBOX_START + i);
+            aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
         }
     }
 }
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 5b4a58bd59c4..73cee3bfdc6f 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
     };
     ListBox LB_COLORSCHEME
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME";
         Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 77 , 58 ) ;
         Border = TRUE;
@@ -60,12 +61,14 @@ TabPage RID_SVXPAGE_COLORCONFIG
     };
     PushButton PB_SAVESCHEME
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME";
         Pos = MAP_APPFONT ( 145, 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Save...";
     };
     PushButton PB_DELETESCHEME
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME";
         Pos = MAP_APPFONT ( 198 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Delete";
@@ -150,6 +153,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_DOCBOUND
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND";
                 CB_POS_SIZE( 2 );
                 Text [ en-US ] = "Text boundaries";
             };
@@ -164,6 +168,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_OBJECTBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES";
                 CB_POS_SIZE( 4 );
                 Text [ en-US ] = "Object boundaries";
             };
@@ -171,6 +176,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_TABLEBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES";
                 CB_POS_SIZE( 5 );
                 Text [ en-US ] = "Table boundaries";
             };
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_LINKS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS";
                 CB_POS_SIZE( 7 );
                 Text [ en-US ] = "Unvisited links";
             };
@@ -192,6 +199,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_LINKSVISITED
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED";
                 CB_POS_SIZE( 8 );
                 Text [ en-US ] = "Visited links";
             };
@@ -226,6 +234,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERFIELDSHADINGS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS";
                 CB_POS_SIZE( 13 );
                 Text [ en-US ] = "Field shadings";
             };
@@ -233,6 +242,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERIDXSHADINGS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS";
                 CB_POS_SIZE( 14 );
                 Text [ en-US ] = "Index and table shadings";
             };
@@ -248,6 +258,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERSECTIONBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES";
                 CB_POS_SIZE( 16 );
                 Text [ en-US ] = "Section boundaries";
             };
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index defc62c95011..a9207701fd52 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -47,18 +47,21 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     CheckBox CB_SEQUENCECHECKING
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING";
         Pos = MAP_APPFONT ( 12, ROW_1 ) ;
         Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use se~quence checking";
     };
     CheckBox CB_RESTRICTED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED";
         Pos = MAP_APPFONT ( 18, ROW_2 );
         Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
         Text[ en-US ] = "Restricted";
     };
     CheckBox CB_TYPE_REPLACE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE";
         Pos = MAP_APPFONT ( 18, ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y );
         Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
         Text[ en-US ] = "~Type and replace";
@@ -77,12 +80,14 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     RadioButton RB_MOVEMENT_LOGICAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL";
         Pos = MAP_APPFONT ( 105, ROW_4 ) ;
         Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Lo~gical";
     };
     RadioButton RB_MOVEMENT_VISUAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL";
         Pos = MAP_APPFONT ( 177, ROW_4 ) ;
         Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Visual";
@@ -101,6 +106,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     ListBox LB_NUMERALS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS";
         Pos = MAP_APPFONT ( 105, ROW_7 ) ;
         Size = MAP_APPFONT ( 69 , 3*RSC_CD_DROPDOWN_HEIGHT ) ;
         DropDown = TRUE ;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 1c76da9212c1..c9ee53ca13fb 100644..100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -168,6 +168,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG )
             String aURL( linguistic::GetWritableDictionaryURL( sDict ) );
             xNewDic = Reference< XDictionary > (
                     xDicList->createDictionary( sDict, aLocale, eType, aURL ) , UNO_QUERY );
+            xNewDic->setActive( sal_True );
         }
         DBG_ASSERT(xNewDic.is(), "NULL pointer");
     }
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index b5d31ce90fe9..ae63c20f4013 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -51,6 +51,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     Edit ED_DICTNAME
     {
+        HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -65,6 +66,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     ListBox LB_DICTLANG
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 30 ) ;
         Size = MAP_APPFONT ( 90 , 66 ) ;
@@ -72,6 +74,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     CheckBox BTN_EXCEPT
     {
+        HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT";
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "~Exception (-)" ;
@@ -124,6 +127,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     ListBox LB_ALLDICTS
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 9 ) ;
         Size = MAP_APPFONT ( 121 , 62 ) ;
@@ -137,6 +141,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     ListBox LB_DICTLANG
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 25 ) ;
         Size = MAP_APPFONT ( 121 , 66 ) ;
@@ -158,6 +163,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     Edit ED_WORD
     {
+        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
@@ -172,6 +178,7 @@ ModalDialog RID_SFXDLG_EDITDICT
 
     Edit ED_REPLACE
     {
+        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE";
         Pos = MAP_APPFONT ( 83 , 56 ) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
         Border = TRUE ;
@@ -180,6 +187,7 @@ ModalDialog RID_SFXDLG_EDITDICT
 
     PushButton PB_NEW_REPLACE
     {
+        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE";
         Pos = MAP_APPFONT ( 209 , 56 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         TabStop = TRUE ;
@@ -187,6 +195,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     PushButton PB_DELETE_REPLACE
     {
+        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE";
         Pos = MAP_APPFONT ( 209 , 71 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index a9091926e3c2..cff77bad88b6 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -32,7 +32,7 @@
 // RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT
 {
-     // HelpId = ;
+    HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -46,6 +46,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_WBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -53,6 +54,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_WBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -67,6 +69,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -74,6 +77,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_EXECTBL
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL";
         Pos = MAP_APPFONT ( 22 , 69 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -81,6 +85,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG";
         Pos = MAP_APPFONT ( 12 , 83 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -95,6 +100,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_PBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 110 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -102,6 +108,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_PBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG";
         Pos = MAP_APPFONT ( 12 , 124 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -112,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 // RID_OFAPAGE_MSFILTEROPT2 -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {
-     // HelpId = ;
+    HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -147,19 +154,19 @@ TabPage RID_OFAPAGE_MSFILTEROPT2
     };
     String ST_CHG_MATH
     {
-        Text [ en-US ] = "MathType to %PRODUCTNAME Math / %PRODUCTNAME Math to MathType";
+        Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse";
     };
     String ST_CHG_WRITER
     {
-        Text [ en-US ] = "WinWord to %PRODUCTNAME Writer / %PRODUCTNAME Writer to WinWord";
+        Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse";
     };
     String ST_CHG_CALC
     {
-        Text [ en-US ] = "Excel to %PRODUCTNAME Calc / %PRODUCTNAME Calc to Excel";
+        Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse";
     };
     String ST_CHG_IMPRESS
     {
-        Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress / %PRODUCTNAME Impress to PowerPoint";
+        Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse";
     };
 };
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b9a181a28438..06d1c46af3df 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1159,51 +1159,6 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
     LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL );
 #endif
 }
-/* -----------------------------23.11.00 14:55--------------------------------
-
- ---------------------------------------------------------------------------*/
-class LangConfigItem_Impl : public ConfigItem
-{
-    Any         aValue;
-    OUString    aPropertyName;
-public:
-    LangConfigItem_Impl(const OUString& rTree, const OUString& rProperty);
-    ~LangConfigItem_Impl();
-
-    virtual void            Commit();
-
-    const Any&  GetValue() const {return aValue;}
-    void        SetValue(Any& rValue)  {aValue = rValue; SetModified();}
-};
-/* -----------------------------23.11.00 15:06--------------------------------
-
- ---------------------------------------------------------------------------*/
-LangConfigItem_Impl::LangConfigItem_Impl(
-    const OUString& rTree, const OUString& rProperty) :
-    ConfigItem(rTree),
-    aPropertyName(rProperty)
-{
-    Sequence<OUString> aNames(1);
-    aNames.getArray()[0] = aPropertyName;
-    Sequence<Any> aValues = GetProperties(aNames);
-    aValue = aValues.getConstArray()[0];
-}
-/* -----------------------------23.11.00 15:06--------------------------------
-
- ---------------------------------------------------------------------------*/
-LangConfigItem_Impl::~LangConfigItem_Impl()
-{}
-/* -----------------------------23.11.00 15:10--------------------------------
-
- ---------------------------------------------------------------------------*/
-void LangConfigItem_Impl::Commit()
-{
-    Sequence<OUString> aNames(1);
-    aNames.getArray()[0] = aPropertyName;
-    Sequence<Any> aValues(1);
-    aValues.getArray()[0] = aValue;
-    PutProperties(aNames, aValues);
-}
 /* -----------------22.07.2003 10:33-----------------
 
  --------------------------------------------------*/
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index dec9c4769481..ed7443ae04b4 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -50,24 +50,28 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_TOOLTIP
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
         Pos = MAP_APPFONT( COL1, ROW1 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Tips";
     };
     CheckBox CB_EXTHELP
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
         Pos = MAP_APPFONT( COL2, ROW2 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Extended tips";
     };
     CheckBox CB_HELPAGENT
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
         Pos = MAP_APPFONT( COL1, ROW3 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Help Agent";
     };
     PushButton PB_HELPAGENT_RESET
     {
+        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
         Pos = MAP_APPFONT( COL2, ROW4 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "~Reset Help Agent";
@@ -80,6 +84,7 @@ TabPage OFA_TP_MISC
     };
     ListBox LB_HELPFORMAT
     {
+        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
         Pos = MAP_APPFONT( COL4, ROW5 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
         DropDown = TRUE ;
@@ -108,6 +113,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_FILEDLG
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
         Pos = MAP_APPFONT( COL1, ROW7 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
@@ -120,6 +126,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_DOCSTATUS
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Printing sets \"document modified\" status";
@@ -138,6 +145,7 @@ TabPage OFA_TP_MISC
     };
     NumericField NF_YEARVALUE
     {
+        HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL4, ROW11 );
         Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
@@ -160,6 +168,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_PRINTDLG
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
@@ -192,6 +201,7 @@ TabPage OFA_TP_VIEW
     };
     MetricField MF_WINDOWSIZE
     {
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE";
         Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
         Border = TRUE ;
@@ -220,6 +230,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSIZE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE";
         Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ;
         Size = MAP_APPFONT ( 45 , 60 ) ;
         DropDown = TRUE ;
@@ -234,6 +245,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSTYLE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE";
         Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ;
         Size = MAP_APPFONT ( 65 , 70 ) ;
         DropDown = TRUE ;
@@ -253,6 +265,7 @@ TabPage OFA_TP_VIEW
     };
     CheckBox CB_SYSTEM_FONT
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT );
         Size = MAP_APPFONT( 114, 16 );
@@ -262,6 +275,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_FONTANTIALIASING
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ;
         Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -275,6 +289,7 @@ TabPage OFA_TP_VIEW
     };
     NumericField NF_AA_POINTLIMIT
     {
+        HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -304,6 +319,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MENU_ICONS
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS";
         Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -324,12 +340,14 @@ TabPage OFA_TP_VIEW
     };
     CheckBox CB_FONT_SHOW
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW";
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show p~review of fonts" ;
     };
     CheckBox CB_FONT_HISTORY
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY";
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show font h~istory" ;
@@ -343,6 +361,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_USE_HARDACCELL
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL";
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use hardware acceleration" ;
@@ -350,6 +369,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_USE_ANTIALIASE
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE";
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use Anti-Aliasing" ;
@@ -369,6 +389,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MOUSEPOS
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS";
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -389,6 +410,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MOUSEMIDDLE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE";
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -412,6 +434,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_SELECTION
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
         Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
         Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Transparency" ;
@@ -419,6 +442,7 @@ TabPage OFA_TP_VIEW
 
     MetricField MF_SELECTION
     {
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION";
         Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
         Border = TRUE ;
@@ -463,6 +487,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_USERINTERFACE
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE";
         Pos = MAP_APPFONT ( 123 , 14 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -484,6 +509,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_LOCALESETTING
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING";
         Pos = MAP_APPFONT ( 123 , 30 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -499,6 +525,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_DECIMALSEPARATOR
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR";
         Pos = MAP_APPFONT ( 123 , 46) ;
         Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "~Same as locale setting ( %1 )";
@@ -517,6 +544,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_CURRENCY
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY";
         Pos = MAP_APPFONT ( 123 , 59 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -545,6 +573,7 @@ TabPage OFA_TP_LANGUAGES
 
     ListBox LB_WEST_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
         Pos = MAP_APPFONT ( 123 ,  88 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -566,6 +595,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_ASIAN_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
         Pos = MAP_APPFONT ( 123 , 104 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -587,6 +617,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_COMPLEX_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
         Pos = MAP_APPFONT ( 123 , 120 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -596,6 +627,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_CURRENT_DOC
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
         Pos = MAP_APPFONT ( 123 , 135 ) ;
         Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "For the current document only";
@@ -614,6 +646,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_ASIANSUPPORT
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
         Pos = MAP_APPFONT ( 12 , 158 ) ;
         Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "E~nabled for Asian languages";
@@ -626,6 +659,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_CTLSUPPORT
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Ena~bled for complex text layout (CTL)";
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index e42b825e9868..d6fa0ec1fdf3 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -70,26 +70,6 @@ struct GeneralTabPage_Impl
 
 // -----------------------------------------------------------------------
 
-// kommt aus adritem.cxx
-//CHINA001 extern String ConvertToStore_Impl( const String& );
-//copy from adritem.cxx, since it will leave in svx.
-String ConvertToStore_Impl( const String& rText )
-{
-    String sRet;
-    USHORT i = 0;
-
-    while ( i < rText.Len() )
-    {
-        if ( rText.GetChar(i) == '\\' || rText.GetChar(i) == '#' )
-            sRet += '\\';
-        sRet += rText.GetChar(i++);
-    }
-    return sRet;
-}
-
-
-// -----------------------------------------------------------------------
-
 SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
 
     SfxTabPage( pParent, CUI_RES(RID_SFXPAGE_GENERAL), rCoreSet ),
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index 6f5fff55892d..bc5721024c1a 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -52,6 +52,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_COMPANY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
         Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
@@ -81,6 +82,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FATHERNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
         Border = TRUE ;
         Hide = TRUE;
         Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
@@ -88,18 +90,21 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FIRSTNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
     };
     Edit ED_NAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
     };
     Edit ED_SHORTNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ;
@@ -121,12 +126,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_STREET
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
         Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
     };
     Edit ED_APARTMENTNR
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR";
         Border = TRUE ;
         Hide = TRUE;
         Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
@@ -141,30 +148,35 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_PLZ
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 24 , LINEH ) ;
     };
     Edit ED_CITY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 24 + HSPACE , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( RIGHT - ( MID + 24 + HSPACE ) , LINEH ) ;
     };
     Edit ED_US_CITY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 90 , LINEH ) ;
     };
     Edit ED_US_STATE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 90 + HSPACE, LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 30 , LINEH ) ;
     };
     Edit ED_US_ZIPCODE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 90 + HSPACE + 30 + HSPACE, LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( RIGHT - ( MID + 90 + HSPACE + 30 + HSPACE ) , LINEH ) ;
@@ -178,6 +190,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_COUNTRY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 4 ) ) ;
         Size = MAP_APPFONT ( RIGHT - MID , LINEH ) ;
@@ -191,12 +204,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_TITLE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 5 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_POSITION
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 5 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -210,12 +225,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_TELPRIVAT
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 6 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_TELCOMPANY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 6 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -229,12 +246,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FAX
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 7 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_EMAIL
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 7 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -247,6 +266,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     CheckBox CB_USEDATA
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_GENERAL:CB_USEDATA";
         Pos = MAP_APPFONT ( 6 , 122 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Hide = TRUE;
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 60db286b192d..5de010b58948 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -32,7 +32,7 @@
  // RID_OFAPAGE_HTMLOPT -----------------------------------------------------
 TabPage RID_OFAPAGE_HTMLOPT
 {
-     // HelpId = ;
+    HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -45,6 +45,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE1
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1";
         Pos = MAP_APPFONT ( 45 , 14 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -67,6 +68,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE2
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2";
         Pos = MAP_APPFONT ( 45 , 30 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -89,6 +91,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE3
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3";
         Pos = MAP_APPFONT ( 45 , 46 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -111,6 +114,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE4
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4";
         Pos = MAP_APPFONT ( 45 , 62 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -133,6 +137,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE5
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5";
         Pos = MAP_APPFONT ( 45 , 78 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -155,6 +160,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE6
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6";
         Pos = MAP_APPFONT ( 45 , 94 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -177,6 +183,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE7
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7";
         Pos = MAP_APPFONT ( 45 , 110 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +212,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_NUMBERS_ENGLISH_US
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US";
         Pos = MAP_APPFONT ( 93 , 14 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         TabStop = TRUE ;
@@ -212,6 +220,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_UNKNOWN_TAGS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS";
         Pos = MAP_APPFONT ( 93 , 28 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         TabStop = TRUE ;
@@ -219,6 +228,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_IGNORE_FONTNAMES
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES";
         Pos = MAP_APPFONT ( 93 , 42 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         TabStop = TRUE ;
@@ -232,6 +242,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     ListBox LB_EXPORT
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT";
         Pos = MAP_APPFONT ( 93 , 69 ) ;
         Size = MAP_APPFONT ( 155 , 50 ) ;
         Border = TRUE ;
@@ -246,24 +257,28 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_STARBASIC
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC";
         Pos = MAP_APPFONT ( 93 , 88 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text = "%PRODUCTNAME ~Basic" ;
     };
     CheckBox CB_STARBASIC_WARNING
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING";
         Pos = MAP_APPFONT ( 99 , 102 ) ;
         Size = MAP_APPFONT ( 149 , 10 ) ;
         Text [ en-US ] = "Display ~warning";
     };
     CheckBox CB_PRINT_EXTENSION
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION";
         Pos = MAP_APPFONT ( 93 , 116 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text [ en-US ] = "~Print layout" ;
     };
     CheckBox CB_LOCAL_GRF
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF";
         Pos = MAP_APPFONT ( 93 , 130 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text [ en-US ] = "~Copy local graphics to Internet" ;
@@ -277,6 +292,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     ListBox LB_CHARSET
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET";
         Pos = MAP_APPFONT ( 162 , 143 ) ;
         Size = MAP_APPFONT ( 86 , 61 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
index 32aa6a6a3280..b1eb055e9b1a 100644
--- a/cui/source/options/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -197,31 +197,3 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
     EndDialog( RET_OK );
     return 0;
 }
-
-// class SvxInfoWindow ---------------------------------------------------
-
-SvxInfoWindow::SvxInfoWindow( Window* pParent, const ResId& rResId ) :
-    Window( pParent, rResId ),
-    m_aInfoText( this )
-{
-    m_aInfoText.SetPosSizePixel( Point( 10, 10 ), Size( 150, 10 ) );
-
-    const StyleSettings& rSettings = GetSettings().GetStyleSettings();
-    Wallpaper aWall( rSettings.GetWindowColor() );
-    SetBackground( aWall );
-    Font aNewFont( m_aInfoText.GetFont() );
-    aNewFont.SetTransparent( TRUE );
-    m_aInfoText.SetFont( aNewFont );
-    m_aInfoText.SetBackground( aWall );
-    m_aInfoText.SetControlForeground( rSettings.GetWindowTextColor() );
-}
-
-void SvxInfoWindow::SetInfoText( const String& rText )
-{
-    m_aInfoText.SetText( rText );
-    Size aSize = m_aInfoText.CalcMinimumSize();
-    Size aWinSize = GetSizePixel();
-    Point aPos( ( aWinSize.Width() - aSize.Width() ) / 2, ( aWinSize.Height() - aSize.Height() ) / 2 );
-    m_aInfoText.SetPosSizePixel( aPos, aSize );
-}
-
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 003390d4600a..523dc8545ca9 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -34,7 +34,7 @@
 
 TabPage RID_SVXPAGE_IMPROVEMENT
 {
-    //!HelpId = HID_OPTIONS_IMPROVEMENT ;
+        HelpId = "cui:TabPage:RID_SVXPAGE_IMPROVEMENT" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     RadioButton RB_YES
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES";
         Pos = MAP_APPFONT ( 12 , 92 ) ;
         Size = MAP_APPFONT ( 215 , 10 ) ;
         Check = TRUE ;
@@ -62,6 +63,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     RadioButton RB_NO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO";
         Pos = MAP_APPFONT ( 12 , 105 ) ;
         Size = MAP_APPFONT ( 215 , 10 ) ;
         Text [ en-US ] = "~No, I do not wish to participate" ;
@@ -84,29 +86,30 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     FixedText FT_NR_REPORTS
     {
         Pos = MAP_APPFONT ( 12 , 132 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of reports sent:" ;
     };
     FixedText FT_NR_REPORTS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 132 ) ;
+        Pos = MAP_APPFONT ( 111 , 132 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     FixedText FT_NR_ACTIONS
     {
         Pos = MAP_APPFONT ( 12 , 145 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of tracked actions:" ;
     };
     FixedText FT_NR_ACTIONS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 145 ) ;
+        Pos = MAP_APPFONT ( 111 , 145 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     PushButton PB_SHOWDATA
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA";
         Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Show Data" ;
     };
     String STR_INFO
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index 29ef718a6c74..b2127d2680e8 100644
--- a/cui/source/options/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -52,6 +52,7 @@
 #include <comphelper/synchronousdispatch.hxx>
 #include <comphelper/uieventslogger.hxx>
 #include <tools/testtoolloader.hxx>
+#include <osl/file.hxx>
 
 #define C2S(s)  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
 
@@ -61,14 +62,16 @@ namespace uno   = ::com::sun::star::uno;
 namespace util  = ::com::sun::star::util;
 using namespace com::sun::star::system;
 
-// class SvxEmptyPage ----------------------------------------------------
-
-SvxEmptyPage::SvxEmptyPage( Window* pParent ) :
-
-    TabPage( pParent, CUI_RES( RID_SVXPAGE_IMPROVEMENT ) )
 
+namespace
 {
-    FreeResource();
+    bool lcl_doesLogfileExist(const ::rtl::OUString& sLogPath)
+    {
+        ::rtl::OUString sLogFile( sLogPath );
+        sLogFile += C2S("/Current.csv");
+        ::osl::File aLogFile(sLogFile);
+        return aLogFile.open(osl_File_OpenFlag_Read) == ::osl::FileBase::E_None;
+    }
 }
 
 // class SvxImprovementOptionsPage ---------------------------------------
@@ -153,7 +156,10 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG )
         uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
             xDesktop, sLogFile, C2S("_default"), 0, aArgs );
         if ( xDoc.is() )
+        {
+            dynamic_cast<Dialog*>(GetParent())->EndDialog( RET_CANCEL );
             return 1;
+        }
     }
 
     return 0;
@@ -164,11 +170,6 @@ SfxTabPage* SvxImprovementOptionsPage::Create( Window* pParent, const SfxItemSet
     return new SvxImprovementOptionsPage( pParent, rSet );
 }
 
-sal_uInt16* SvxImprovementOptionsPage::GetRanges()
-{
-    return NULL;
-}
-
 sal_Bool SvxImprovementOptionsPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
@@ -259,11 +260,13 @@ void SvxImprovementOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
                 if ( xSubst.is() )
                     sPath = xSubst->substituteVariables( sPath, sal_False );
                 m_sLogPath = sPath;
+                m_aShowDataPB.Enable(lcl_doesLogfileExist(m_sLogPath));
             }
         }
     }
     catch( uno::Exception& )
     {
+        m_aShowDataPB.Enable(false);
     }
 }
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 685fa024fa62..c8fa0b9b5f48 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -136,47 +136,6 @@ const char* SEARCHENGINE_GROUP  = "SearchEngines-$(vlang)";
 
 // -----------------------------------------------------------------------
 
-String lcl_MakeTabEntry(const SfxFilter* pFilter)
-{
-    String sEntry(pFilter->GetMimeType());
-    sEntry += '\t';
-    sEntry += pFilter->GetWildcard().GetWildCard();
-    sEntry += '\t';
-    sEntry += pFilter->GetName();
-#if defined(OS2)
-    sEntry += '\t';
-    sEntry += pFilter->GetTypeName();
-#endif
-    return sEntry;
-}
-
-// -----------------------------------------------------------------------
-
-BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ )
-{
-    BOOL bRet = FALSE;
-/*!!! (pb) needs new implementation
-    String aIniEntry;
-    String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ),
-                                              String::CreateFromAscii("java") );
-    INetURLObject aIniFileObj( aFullName, INET_PROT_FILE );
-    String aIniPath = aIniFileObj.getName();
-    if ( pIniMgr->SearchFile( aIniPath ) )
-    {
-        Config aJavaCfg( aIniPath );
-        aJavaCfg.SetGroup( "Java" );
-        ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) );
-        String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8);
-        String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8);
-        if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() )
-            bRet = TRUE;
-    }
-*/
-    return bRet;
-}
-
-// -----------------------------------------------------------------------
-
 void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
 {
     if ( bOnlyNumeric )
@@ -1130,146 +1089,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
-
-/********************************************************************/
-/********************************************************************/
-/*                                                                  */
-/*  SvxOtherTabPage                                                 */
-/*                                                                  */
-/********************************************************************/
-/********************************************************************/
-
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
-/*
-SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
-
-    PatternField( pParent, rResId ),
-
-    sMsg233 ( ResId( ST_MSG_233 ) ),
-    sMsg255 ( ResId( ST_MSG_255 ) )
-
-{
-    FreeResource();
-    SelectFixedFont();
-} */
-
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
-
-/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt )
-{
-    PatternField::KeyInput( rKEvt );
-    BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE );
-    String sEntry( GetText() );
-    sEntry[(USHORT)3] = '.';
-    sEntry[(USHORT)7] = '.';
-    sEntry[(USHORT)11] = '.';
-    Selection aSelection( GetSelection() );
-    String sPart( sEntry.GetToken( 0, '.' ) );
-    USHORT i, nPart( sPart.EraseLeadingChars() );
-    BOOL bSet = FALSE;
-
-    if ( sPart.Len() && ( !nPart || nPart > 255 ) )
-    {
-        // der erste Part darf nicht 0 und nicht gr"osser 255 sein
-        String sMsg( sPart );
-        sMsg += ' ';
-        sMsg += sMsg233;
-        InfoBox( this, sMsg ).Execute();
-
-        if ( nPart == 0 )
-            sPart = "  1";
-        else
-            sPart = "255";
-        sEntry.SetToken( 0, '.', sPart );
-        bSet = TRUE;
-    };
-
-    for ( i = 1; i < 4; i++ )
-    {
-        // die anderen Parts d"urfen nicht gr"osser 255 sein
-        sPart = sEntry.GetToken( i, '.' );
-        nPart = sPart.EraseLeadingChars();
-
-        if ( nPart > 255 )
-        {
-            String sMsg( sPart );
-            sMsg += ' ';
-            sMsg += sMsg255;
-            InfoBox( this, sMsg ).Execute();
-
-            if ( nPart == 0 )
-                sPart = "  1";
-            else
-                sPart = "255";
-            sEntry.SetToken( i, '.', sPart );
-            bSet = TRUE;
-        };
-    }
-
-    if ( bSet )
-    {
-        SetText( sEntry );
-        SetSelection( aSelection );
-    }
-}
-*/
-// -----------------------------------------------------------------------
-#if 0
-long SvxPatternField::Notify( NotifyEvent& rNEvt )
-{
-    return PatternField::Notify( rNEvt );
-/*! long nHandled = 0;
-
-    if ( rNEvt.GetType() == EVENT_KEYUP )
-    {
-        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-        KeyInput( *pKEvt );
-        nHandled = 1;
-    }
-    return nHandled;*/
-}
-#endif
-
-// class JavaScriptDisableQueryBox_Impl --------------------------------------
-
-class JavaScriptDisableQueryBox_Impl : public ModalDialog
-{
-private:
-    FixedImage      aImage;
-    FixedText       aWarningFT;
-    CheckBox        aDisableCB;
-    OKButton        aYesBtn;
-    CancelButton    aNoBtn;
-
-public:
-    JavaScriptDisableQueryBox_Impl( Window* pParent );
-
-    BOOL        IsWarningDisabled() const { return aDisableCB.IsChecked(); }
-};
-
-JavaScriptDisableQueryBox_Impl::JavaScriptDisableQueryBox_Impl( Window* pParent ) :
-
-    ModalDialog( pParent, CUI_RES( RID_SVXDLG_OPT_JAVASCRIPT_DISABLE ) ),
-
-    aImage      ( this, CUI_RES( IMG_JSCPT_WARNING ) ),
-    aWarningFT  ( this, CUI_RES( FT_JSCPT_WARNING ) ),
-    aDisableCB  ( this, CUI_RES( CB_JSCPT_DISABLE ) ),
-    aYesBtn     ( this, CUI_RES( BTN_JSCPT_YES ) ),
-    aNoBtn      ( this, CUI_RES( BTN_JSCPT_NO ) )
-
-{
-    FreeResource();
-
-    aYesBtn.SetText( Button::GetStandardText( BUTTON_YES ) );
-    aNoBtn.SetText( Button::GetStandardText( BUTTON_NO ) );
-    aImage.SetImage( WarningBox::GetStandardImage() );
-}
-
 //#98647#----------------------------------------------
 void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
 {   // try to show tips just like as on toolbars
@@ -1329,17 +1148,10 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet
     ,maMacroSecFL       ( this, CUI_RES( FL_SEC_MACROSEC ) )
     ,maMacroSecFI       ( this, CUI_RES( FI_SEC_MACROSEC ) )
     ,maMacroSecPB       ( this, CUI_RES( PB_SEC_MACROSEC ) )
-    ,maFilesharingFL    ( this, CUI_RES( FL_SEC_FILESHARING ) )
-    ,maRecommReadOnlyCB ( this, CUI_RES( CB_SEC_RECOMMREADONLY ) )
-    ,maRecordChangesCB  ( this, CUI_RES( CB_SEC_RECORDCHANGES ) )
-    ,maProtectRecordsPB ( this, CUI_RES( PB_SEC_PROTRECORDS ) )
 
     ,mpSecOptions       ( new SvtSecurityOptions )
     ,mpSecOptDlg        ( NULL )
-    ,meRedlingMode      ( RL_NONE )
 
-    ,msProtectRecordsStr(               CUI_RES( STR_SEC_PROTRECORDS ) )
-    ,msUnprotectRecordsStr(             CUI_RES( STR_SEC_UNPROTRECORDS ) )
     ,msPasswordStoringDeactivateStr(    CUI_RES( STR_SEC_NOPASSWDSAVE ) )
 
 {
@@ -1353,8 +1165,6 @@ SvxSecurityTabPage::SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet
     maMasterPasswordCB.SetClickHdl( LINK( this, SvxSecurityTabPage, MasterPasswordCBHdl ) );
     maShowConnectionsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ShowPasswordsHdl ) );
     maMacroSecPB.SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl ) );
-    maProtectRecordsPB.SetClickHdl( LINK( this, SvxSecurityTabPage, ProtectRecordsPBHdl ) );
-    maRecordChangesCB.SetClickHdl( LINK( this, SvxSecurityTabPage, RecordChangesCBHdl ) );
 
     ActivatePage( rSet );
 }
@@ -1524,127 +1334,6 @@ IMPL_LINK( SvxSecurityTabPage, MacroSecPBHdl, void*, EMPTYARG )
     return 0;
 }
 
-namespace
-{
-    enum RedlineFunc    { RF_ON, RF_PROTECT };
-
-    const SfxBoolItem* ExecuteRecordChangesFunc( SvxSecurityTabPage::RedliningMode _eMode, RedlineFunc _eFunc, BOOL _bVal, Window* _pParent = NULL )
-    {
-        const SfxBoolItem* pRet = NULL;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot;
-            if ( _eMode == SvxSecurityTabPage::RL_WRITER )
-                nSlot = ( _eFunc == RF_ON )? FN_REDLINE_ON : FN_REDLINE_PROTECT;
-            else
-                nSlot = ( _eFunc == RF_ON )? FID_CHG_RECORD : SID_CHG_PROTECT;
-
-            // execute
-            SfxViewShell* pViewSh = SfxViewShell::Current();
-            if( pViewSh )
-            {
-                bool bNeedItem = ( _eMode == SvxSecurityTabPage::RL_WRITER || _eFunc != RF_ON );
-                SfxBoolItem* pItem = bNeedItem ? new SfxBoolItem( nSlot, _bVal ) : NULL;
-                SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-                if ( _pParent )
-                {
-                    OfaPtrItem aParentItem( SID_ATTR_PARENTWINDOW, _pParent );
-                    pRet = static_cast< const SfxBoolItem* >(
-                        pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, &aParentItem, pItem, 0L ) );
-                }
-                else
-                    pRet = static_cast< const SfxBoolItem* >(
-                        pDisp->Execute( nSlot, SFX_CALLMODE_SYNCHRON, pItem, 0L ) );
-                delete pItem;
-            }
-        }
-
-        return pRet;
-    }
-
-    bool QueryState( USHORT _nSlot, bool& _rValue )
-    {
-        bool bRet = false;
-
-        SfxViewShell* pViewSh = SfxViewShell::Current();
-        if( pViewSh )
-        {
-            const SfxPoolItem* pItem;
-            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-            bRet = SFX_ITEM_AVAILABLE <= pDisp->QueryState( _nSlot, pItem );
-            if( bRet )
-                _rValue = ( static_cast< const SfxBoolItem* >( pItem ) )->GetValue();
-        }
-
-        return bRet;
-    }
-
-    bool QueryRecordChangesProtectionState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue )
-    {
-        bool bRet = false;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
-            bRet = QueryState( nSlot, _rValue );
-        }
-
-        return bRet;
-    }
-
-    bool QueryRecordChangesState( SvxSecurityTabPage::RedliningMode _eMode, bool& _rValue )
-    {
-        bool bRet = false;
-
-        if( _eMode != SvxSecurityTabPage::RL_NONE )
-        {
-            USHORT nSlot = ( _eMode == SvxSecurityTabPage::RL_WRITER )? FN_REDLINE_ON : FID_CHG_RECORD;
-            bRet = QueryState( nSlot, _rValue );
-        }
-
-        return bRet;
-    }
-}
-
-IMPL_LINK( SvxSecurityTabPage, RecordChangesCBHdl, void*, EMPTYARG )
-{
-    ExecuteRecordChangesFunc( meRedlingMode, RF_ON, maRecordChangesCB.IsChecked(), this );
-    CheckRecordChangesState();
-    return 0;
-}
-
-IMPL_LINK( SvxSecurityTabPage, ProtectRecordsPBHdl, void*, EMPTYARG )
-{
-    bool bProt;
-    QueryRecordChangesProtectionState( meRedlingMode, bProt );
-    ExecuteRecordChangesFunc( meRedlingMode, RF_PROTECT, !bProt, this );
-    CheckRecordChangesState();
-
-    if ( QueryRecordChangesProtectionState( meRedlingMode, bProt ) )
-    {
-        // RecordChangesCB is enabled if protection is off
-        maRecordChangesCB.Enable( !bProt );
-        // toggle text of button "Protect" <-> "Unprotect"
-        String sNewText = bProt ? msUnprotectRecordsStr : msProtectRecordsStr;
-        maProtectRecordsPB.SetText( sNewText );
-    }
-    return 0;
-}
-
-void SvxSecurityTabPage::CheckRecordChangesState( void )
-{
-    bool bVal;
-    if( QueryRecordChangesState( meRedlingMode, bVal ) )
-    {
-        maRecordChangesCB.Enable();
-        maRecordChangesCB.Check( bVal );
-    }
-    else
-        maRecordChangesCB.Disable();        // because now we don't know the state!
-
-    maProtectRecordsPB.Enable( QueryRecordChangesProtectionState( meRedlingMode, bVal ) );
-}
 
 void SvxSecurityTabPage::InitControls()
 {
@@ -1661,30 +1350,13 @@ void SvxSecurityTabPage::InitControls()
         maMacroSecFL.Hide();
         maMacroSecFI.Hide();
         maMacroSecPB.Hide();
-
-        // rearrange the following controls
-        Point aNewPos = maFilesharingFL.GetPosPixel();
-        long nDelta = aNewPos.Y() - maMacroSecFL.GetPosPixel().Y();
-
-        Window* pWins[] =
-        {
-            &maFilesharingFL, &maRecommReadOnlyCB, &maRecordChangesCB, &maProtectRecordsPB
-        };
-        Window** pCurrent = pWins;
-        const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] );
-        for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
-        {
-            aNewPos = (*pCurrent)->GetPosPixel();
-            aNewPos.Y() -= nDelta;
-            (*pCurrent)->SetPosPixel( aNewPos );
-        }
     }
 
     // one button too small for its text?
     sal_Int32 i = 0;
     long nBtnTextWidth = 0;
     Window* pButtons[] = { &maSecurityOptionsPB, &maMasterPasswordPB,
-                            &maShowConnectionsPB, &maMacroSecPB, &maProtectRecordsPB };
+                           &maShowConnectionsPB, &maMacroSecPB };
     Window** pButton = pButtons;
     const sal_Int32 nBCount = sizeof( pButtons ) / sizeof( pButtons[ 0 ] );
     for ( ; i < nBCount; ++i, ++pButton )
@@ -1724,8 +1396,7 @@ void SvxSecurityTabPage::InitControls()
         }
 
         Window* pControls[] = { &maSecurityOptionsFI, &maSavePasswordsCB,
-                                &maMasterPasswordFI, &maMacroSecFI,
-                                &maRecommReadOnlyCB, &maRecordChangesCB };
+                                &maMasterPasswordFI, &maMacroSecFI };
         Window** pControl = pControls;
         const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[ 0 ] );
         for ( i = 0; i < nCCount; ++i, ++pControl )
@@ -1793,25 +1464,6 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 namespace
 {
-/*    bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg )
-    {
-        bool    b = _rOpt.IsOptionEnabled( _eOpt );
-        _rCtrl.Enable( b );
-        _Img.Show( !b );
-        return b;
-    }
-*/
-    bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt,
-                                                        CheckBox& _rCtrl, FixedImage& _rImg )
-    {
-//        bool    b = Enable( _rOpt, _eOpt, _rCtrl, _rImg );
-        bool    b = _rOpt.IsOptionEnabled( _eOpt );
-        _rCtrl.Enable( b );
-        _rImg.Show( !b );
-        _rCtrl.Check( _rOpt.IsOptionSet( _eOpt ) );
-        return b;
-    }
-
     bool CheckAndSave( SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, const bool _bIsChecked, bool& _rModfied )
     {
         bool bModified = false;
@@ -1844,15 +1496,6 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& )
         CheckAndSave( *mpSecOptions, SvtSecurityOptions::E_CTRLCLICK_HYPERLINK, mpSecOptDlg->IsCtrlHyperlinkChecked(), bModified );
     }
 
-    // document options
-    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
-    if( pCurDocShell )
-    {
-        if( pCurDocShell->HasSecurityOptOpenReadOnly() )
-            pCurDocShell->SetSecurityOptOpenReadOnly( maRecommReadOnlyCB.IsChecked() );
-
-    }
-
     return bModified;
 }
 
@@ -1860,65 +1503,10 @@ BOOL SvxSecurityTabPage::FillItemSet( SfxItemSet& )
 
 void SvxSecurityTabPage::Reset( const SfxItemSet& )
 {
-    String sNewText = msProtectRecordsStr;
     SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
     if( pCurDocShell )
     {
-        bool bIsHTMLDoc = false;
-        SfxViewShell* pViewSh = SfxViewShell::Current();
-        if( pViewSh )
-        {
-            const SfxPoolItem* pItem;
-            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-            if ( SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ) )
-            {
-                USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
-                bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 );
-            }
-        }
-
-        sal_Bool bIsReadonly = pCurDocShell->IsReadOnly();
-        if( pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc )
-        {
-            maRecommReadOnlyCB.Check( pCurDocShell->IsSecurityOptOpenReadOnly() );
-            maRecommReadOnlyCB.Enable( !bIsReadonly );
-        }
-        else
-            maRecommReadOnlyCB.Disable();
-
-        bool bVal;
-        if ( QueryRecordChangesState( RL_WRITER, bVal ) && !bIsHTMLDoc )
-            meRedlingMode = RL_WRITER;
-        else if( QueryRecordChangesState( RL_CALC, bVal ) )
-            meRedlingMode = RL_CALC;
-        else
-            meRedlingMode = RL_NONE;
-
-        if ( meRedlingMode != RL_NONE )
-        {
-            maRecordChangesCB.Check( bVal );
-            maRecordChangesCB.Enable( !bVal && !bIsReadonly );
-            maProtectRecordsPB.Enable(
-                QueryRecordChangesProtectionState( meRedlingMode, bVal ) && !bIsReadonly );
-            // set the right text
-            if ( bVal )
-                sNewText = msUnprotectRecordsStr;
-        }
-        else
-        {
-            // only Writer and Calc support redlining
-            maRecordChangesCB.Disable();
-            maProtectRecordsPB.Disable();
-        }
-    }
-    else
-    {   // no doc -> hide document settings
-        maRecommReadOnlyCB.Disable();
-        maRecordChangesCB.Disable();
-        maProtectRecordsPB.Disable();
     }
-
-    maProtectRecordsPB.SetText( sNewText );
 }
 
 //added by jmeng begin
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 09de829ae132..1bd09225ac9b 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -116,13 +116,7 @@
 #define FL_SEC_MACROSEC             19
 #define FI_SEC_MACROSEC             20
 #define PB_SEC_MACROSEC             21
-#define FL_SEC_FILESHARING          22
-#define CB_SEC_RECOMMREADONLY       23
-#define CB_SEC_RECORDCHANGES        24
-#define PB_SEC_PROTRECORDS          25
 
-#define STR_SEC_PROTRECORDS         10
-#define STR_SEC_UNPROTRECORDS       11
 #define STR_SEC_NOPASSWDSAVE        12
 
 #define TP_WIDTH                    260
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 588549787d99..f75ff7d05c44 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -232,8 +232,6 @@ class SvxSecurityTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
-public:
-    enum RedliningMode  { RL_NONE, RL_WRITER, RL_CALC };
 
 private:
     FixedLine           maSecurityOptionsFL;
@@ -251,17 +249,10 @@ private:
     FixedInfo           maMacroSecFI;
     PushButton          maMacroSecPB;
 
-    FixedLine           maFilesharingFL;
-    CheckBox            maRecommReadOnlyCB;
-    CheckBox            maRecordChangesCB;
-    PushButton          maProtectRecordsPB;
 
     SvtSecurityOptions*         mpSecOptions;
     svx::SecurityOptionsDialog* mpSecOptDlg;
 
-    RedliningMode       meRedlingMode;
-    String              msProtectRecordsStr;
-    String              msUnprotectRecordsStr;
     String              msPasswordStoringDeactivateStr;
 
     DECL_LINK(          SecurityOptionsHdl, PushButton* );
@@ -270,10 +261,7 @@ private:
     DECL_LINK(          MasterPasswordCBHdl, void* );
     DECL_LINK(          ShowPasswordsHdl, PushButton* );
     DECL_LINK(          MacroSecPBHdl, void* );
-    DECL_LINK(          RecordChangesCBHdl, void* );
-    DECL_LINK(          ProtectRecordsPBHdl, void* );
 
-    void                CheckRecordChangesState( void );
     void                InitControls();
 
                 SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 2b2829d9f2e5..f4837b514483 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -41,6 +41,7 @@
 
 TabPage RID_SVXPAGE_INET_MOZPLUGIN
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -54,6 +55,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
     };
     CheckBox CB_MOZPLUGIN_CODE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT (  236 , 10  ) ;
         TabStop = TRUE ;
@@ -87,6 +89,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     ListBox LB_PROXYMODE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 11 ) ;
         Size = MAP_APPFONT ( 49 , 48 ) ;
         Border = TRUE ;
@@ -110,6 +113,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTP_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 27 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTP_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 27 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTPS_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 43 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -154,6 +160,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTPS_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 43 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -167,6 +174,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_FTP_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 59 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -180,6 +188,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_FTP_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 59 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_SOCKS_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 75 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +215,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_SOCKS_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 75 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -217,6 +228,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_NOPROXYFOR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 91 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -235,18 +247,21 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     RadioButton RB_DNS_AUTO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_AUTO";
         Pos = MAP_APPFONT( 12, 111 );
         Size = MAP_APPFONT( 236, 10 );
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton RB_DNS_MANUAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_MANUAL";
         Pos = MAP_APPFONT( 12, 124 );
         Size = MAP_APPFONT( 75, 10 );
         Text [ en-US ] = "~Manual" ;
     };
     PatternField ED_DNS
     {
+        HelpID = "cui:PatternField:RID_SVXPAGE_INET_PROXY:ED_DNS";
         Pos = MAP_APPFONT( 90, 126 );
         Size = MAP_APPFONT( 66, 12 );
         Border = TRUE ;
@@ -287,6 +302,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     ListBox LB_SEARCH
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH";
         Pos = MAP_APPFONT ( 12 , GB_SEARCH_TOP + 11 ) ;
         Size = MAP_APPFONT ( 39 , 120 ) ;
         Border = TRUE ;
@@ -303,6 +319,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_SEARCH_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 11 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -315,6 +332,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     RadioButton RB_AND
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Check = TRUE ;
@@ -322,12 +340,14 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     RadioButton RB_OR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "~Or" ;
     };
     RadioButton RB_EXACT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "E~xact" ;
@@ -340,6 +360,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_URL
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -352,6 +373,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_POSTFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -364,6 +386,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_SEPARATOR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
         Border = TRUE ;
@@ -376,6 +399,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     ListBox ED_CASE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE";
         Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ;
         Size = MAP_APPFONT ( 42 , 48 ) ;
         Border = TRUE ;
@@ -389,24 +413,28 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     PushButton PB_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
         Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "N~ew";
     };
     PushButton PB_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
         Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
     };
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
         Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify" ;
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
         Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
@@ -426,6 +454,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
 
 TabPage RID_SVXPAGE_INET_SECURITY
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY";
     OutputSize = TRUE ;
     Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT );
     SVLook = TRUE;
@@ -446,6 +475,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_SECURITYOPTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS";
         Pos = MAP_APPFONT( COL_3, ROW_2a );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Options...";
@@ -458,6 +488,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     CheckBox CB_SEC_SAVEPASSWORDS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS";
         Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
         Size = MAP_APPFONT( COL_2-COL_1, 16 );
         Wordbreak = TRUE;
@@ -465,12 +496,14 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_CONNECTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS";
         Pos = MAP_APPFONT( COL_3, ROW_3-1 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Connections...";
     };
     CheckBox CB_SEC_MASTERPASSWORD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD";
         Pos = MAP_APPFONT( COL_1a, ROW_4 );
         Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Protected by a master password (recommended)";
@@ -484,6 +517,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_MASTERPASSWORD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD";
         Pos = MAP_APPFONT( COL_3, ROW_4a );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Master Password...";
@@ -503,41 +537,11 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_MACROSEC
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
         Pos = MAP_APPFONT( COL_3, ROW_6-2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Macro Security...";
     };
-    FixedLine FL_SEC_FILESHARING
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_7 );
-        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "File sharing options for this document";
-    };
-    CheckBox CB_SEC_RECOMMREADONLY
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_8 );
-        Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Open this document in read-only mode";
-    };
-    CheckBox CB_SEC_RECORDCHANGES
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_9 );
-        Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Record changes";
-    };
-    PushButton PB_SEC_PROTRECORDS
-    {
-        Pos = MAP_APPFONT( COL_3, ROW_9-2 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-    };
-    String STR_SEC_PROTRECORDS
-    {
-        Text [ en-US ] = "Protect...";
-    };
-    String STR_SEC_UNPROTRECORDS
-    {
-        Text [ en-US ] = "Unprotect...";
-    };
     String STR_SEC_NOPASSWDSAVE
     {
         Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?";
@@ -554,6 +558,7 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS
 
 ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE";
     OutputSize = TRUE;
     Size = MAP_APPFONT( 150, 81 );
     Moveable = TRUE;
@@ -572,6 +577,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
     };
     CheckBox CB_JSCPT_DISABLE
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE";
         Pos = MAP_APPFONT( 39, 45 );
         Size = MAP_APPFONT( 195, 12 );
         Hide = TRUE;
@@ -622,6 +628,7 @@ TabPage RID_SVXPAGE_INET_MAIL
 
     Edit ED_MAILERURL
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL";
         Pos = MAP_APPFONT ( 60 , 18 ) ;
         Size = MAP_APPFONT ( 171 , 12 ) ;
         Border = TRUE;
@@ -629,6 +636,7 @@ TabPage RID_SVXPAGE_INET_MAIL
 
     PushButton PB_MAILERURL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL";
         Pos = MAP_APPFONT ( 234 , 17 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "..." ;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 31a40f2cd221..2a043f6846a7 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -65,56 +65,6 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
-// class SvxJavaTable ----------------------------------------------------
-
-SvxJavaTable::SvxJavaTable( Window* _pParent, const ResId& _rId ) :
-
-    SvxSimpleTable( _pParent, _rId )
-
-{
-}
-
-SvxJavaTable::~SvxJavaTable()
-{
-}
-
-void SvxJavaTable::SetTabs()
-{
-    SvxSimpleTable::SetTabs();
-/*
-    USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT |
-                     SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE;
-    if ( aTabs.Count() > 0 )
-    {
-        SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0);
-        pTab->nFlags &= ~nAdjust;
-        pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE;
-    }
-*/
-}
-
-void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt )
-{
-    m_aCurMousePoint = _rMEvt.GetPosPixel();
-    SvxSimpleTable::MouseButtonUp( _rMEvt );
-}
-
-void SvxJavaTable::KeyInput( const KeyEvent& rKEvt )
-{
-    if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() )
-    {
-        SvLBoxEntry* pEntry = FirstSelected();
-        if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED )
-        {
-            SetCheckButtonState( pEntry, SV_BUTTON_CHECKED );
-            GetCheckButtonHdl().Call( NULL );
-            return ;
-        }
-    }
-
-    SvxSimpleTable::KeyInput( rKEvt );
-}
-
 // -----------------------------------------------------------------------
 
 bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB )
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 4bbd56906708..09eeb4ad9896 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -47,27 +47,6 @@ typedef struct _JavaInfo JavaInfo;
 class   SvxJavaParameterDlg;
 class   SvxJavaClassPathDlg;
 
-// class SvxJavaTable ----------------------------------------------------
-
-class SvxJavaTable : public SvxSimpleTable
-{
-    using SvxSimpleTable::SetTabs;
-private:
-    Point               m_aCurMousePoint;
-
-protected:
-    virtual void        SetTabs();
-    virtual void        MouseButtonUp( const MouseEvent& _rMEvt );
-    virtual void        KeyInput( const KeyEvent& rKEvt );
-
-public:
-    SvxJavaTable( Window* _pParent, const ResId& _rId );
-    ~SvxJavaTable();
-
-
-    inline Point        GetCurMousePoint() { return m_aCurMousePoint; }
-};
-
 // class SvxJavaOptionsPage ----------------------------------------------
 
 class SvxJavaOptionsPage : public SfxTabPage
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 0d55fd6f64f8..db052d1c5fd8 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -50,6 +50,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
     };
     CheckBox CB_JAVA_ENABLE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "~Use a Java runtime environment" ;
@@ -75,18 +76,21 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
     };
     PushButton PB_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD";
         Pos = MAP_APPFONT ( 204 , 38 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
     };
     PushButton PB_PARAMETER
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER";
         Pos = MAP_APPFONT ( 204 , 55 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Parameters..." ;
     };
     PushButton PB_CLASSPATH
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH";
         Pos = MAP_APPFONT ( 204 , 72 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Class Path..." ;
@@ -135,12 +139,14 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     Edit ED_PARAMETER
     {
+        HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER";
         Pos = MAP_APPFONT ( 6 , 15 ) ;
         Size = MAP_APPFONT ( 202 , 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN";
         Pos = MAP_APPFONT ( 214 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Assign" ;
@@ -153,6 +159,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     ListBox LB_ASSIGNED
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 42 ) ;
         Size = MAP_APPFONT ( 202 , 53 ) ;
@@ -166,6 +173,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     PushButton PB_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE";
         Pos = MAP_APPFONT ( 214 , 42 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
@@ -211,6 +219,7 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
     };
     ListBox LB_PATH
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 172 , 72 ) ;
         Border = TRUE ;
@@ -218,18 +227,21 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
     };
     PushButton PB_ADDARCHIVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE";
         Pos = MAP_APPFONT ( 184 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add Archive..." ;
     };
     PushButton PB_ADDPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH";
         Pos = MAP_APPFONT ( 184 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Add ~Folder" ;
     };
     PushButton PB_REMOVE_PATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH";
         Pos = MAP_APPFONT ( 184 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index 98963647e9c4..463e68881e4c 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -45,96 +45,112 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
     };
     CheckBox CB_MATCH_CASE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~uppercase/lowercase";
     };
     CheckBox CB_MATCH_FULL_HALF_WIDTH
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~full-width/half-width forms";
     };
     CheckBox CB_MATCH_HIRAGANA_KATAKANA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~hiragana/katakana";
     };
     CheckBox CB_MATCH_CONTRACTIONS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~contractions (yo-on, sokuon)";
     };
     CheckBox CB_MATCH_MINUS_DASH_CHOON
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON";
         Pos = MAP_APPFONT ( 12 , 70 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~minus/dash/cho-on";
     };
     CheckBox CB_MATCH_REPEAT_CHAR_MARKS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "'re~peat character' marks";
     };
     CheckBox CB_MATCH_VARIANT_FORM_KANJI
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI";
         Pos = MAP_APPFONT ( 12 , 98 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~variant-form kanji (itaiji)";
     };
     CheckBox CB_MATCH_OLD_KANA_FORMS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS";
         Pos = MAP_APPFONT ( 12 , 112) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~old Kana forms";
     };
     CheckBox CB_MATCH_DIZI_DUZU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU";
         Pos = MAP_APPFONT ( 136 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~di/zi, du/zu";
     };
     CheckBox CB_MATCH_BAVA_HAFA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA";
         Pos = MAP_APPFONT ( 136 , 28 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ba/va, ha/fa";
     };
     CheckBox CB_MATCH_TSITHICHI_DHIZI
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI";
         Pos = MAP_APPFONT ( 136 , 42 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~tsi/thi/chi, dhi/zi";
     };
     CheckBox CB_MATCH_HYUFYU_BYUVYU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU";
         Pos = MAP_APPFONT ( 136 , 56 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "h~yu/fyu, byu/vyu";
     };
     CheckBox CB_MATCH_SESHE_ZEJE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE";
         Pos = MAP_APPFONT ( 136 , 70 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~se/she, ze/je";
     };
     CheckBox CB_MATCH_IAIYA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA";
         Pos = MAP_APPFONT ( 136 , 84 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ia/iya (piano/piyano)";
     };
     CheckBox CB_MATCH_KIKU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU";
         Pos = MAP_APPFONT ( 136 , 98 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ki/ku (tekisuto/tekusuto)";
     };
     CheckBox CB_MATCH_PROLONGED_SOUNDMARK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK";
         Pos = MAP_APPFONT ( 136 , 112 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Prolon~ged vowels (ka-/kaa)";
@@ -147,18 +163,21 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
     };
     CheckBox CB_IGNORE_PUNCTUATION
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Pu~nctuation characters";
     };
     CheckBox CB_IGNORE_WHITESPACES
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~Whitespace characters";
     };
     CheckBox CB_IGNORE_MIDDLE_DOT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT";
         Pos = MAP_APPFONT ( 136 , 139 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Midd~le dots";
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index be0378f171e8..ace1f8e193bf 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -59,6 +59,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     ListBox LB_EDIT_MODULES_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 83 , 14 ) ;
         Size = MAP_APPFONT ( 95 , 80 ) ;
@@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_UP
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP";
         Pos = MAP_APPFONT ( 184 , 32 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -81,6 +83,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_DOWN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN";
         Pos = MAP_APPFONT ( 184 , 49 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -88,6 +91,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_BACK
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK";
         Pos = MAP_APPFONT ( 184 , 66 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -164,6 +168,7 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
     };
     NumericField ED_PREBREAK
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -220,6 +225,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_MODULES_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -241,6 +247,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_NEW_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC";
         Pos = MAP_APPFONT ( 198 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -248,6 +255,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_EDIT_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC";
         Pos = MAP_APPFONT ( 198 , 87 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -255,6 +263,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_DEL_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC";
         Pos = MAP_APPFONT ( 198 , 104 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -276,6 +285,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_OPTIONS_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT";
         Pos = MAP_APPFONT ( 198 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 557fa6a8d960..5c95cbb53aa6 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -51,6 +51,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField ED_UNDO
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW1 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -80,6 +81,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_GRAPHICCACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW3 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -103,6 +105,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_GRAPHICOBJECTCACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW4 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -127,6 +130,7 @@ TabPage OFA_TP_MEMORY
     };
     TimeField TF_GRAPHICOBJECTTIME
     {
+        HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW5 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -179,6 +183,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_OLECACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW7 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -195,6 +200,7 @@ TabPage OFA_TP_MEMORY
     };
     CheckBox CB_QUICKLAUNCH
     {
+        HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Load %PRODUCTNAME during system start-up";
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f3d31aa33025..d4997cc6f4f9 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -35,7 +35,6 @@
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/app.hxx>
-#include <svl/pickerhelper.hxx>
 #include <svl/aeitem.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/filedlg.hxx>
@@ -639,8 +638,6 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
             xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >(
                 xFactory->createInstance( aService ), UNO_QUERY );
 
-//          svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
-
             INetURLObject aURL( sWritable, INET_PROT_FILE );
             xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 6b02abb5764a..6adf8fa875ce 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -65,12 +65,14 @@ TabPage RID_SFXPAGE_PATH
     };
     PushButton BTN_PATH
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH";
         Pos = MAP_APPFONT ( 183 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
     };
     PushButton BTN_STANDARD
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
         Pos = MAP_APPFONT ( 115 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Default" ;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 70ef2d682941..d9849050247e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -78,37 +78,6 @@ using rtl::OUString;
 #define WININDEX_AUTOSAVE           ((USHORT)6)
 #define WININDEX_SAVEURL_RELFSYS    ((USHORT)9)
 
-// -------------------- --------------------------------------------------
-class FilterWarningDialog_Impl : public ModalDialog
-{
-    OKButton        aOk;
-    CancelButton    aCancel;
-    FixedImage      aImage;
-    FixedInfo       aFilterWarningFT;
-
-    public:
-    FilterWarningDialog_Impl(Window* pParent);
-
-    void            SetFilterName(const String& rFilterUIName);
-};
-// ----------------------------------------------------------------------
-FilterWarningDialog_Impl::FilterWarningDialog_Impl(Window* pParent) :
-    ModalDialog(pParent, CUI_RES( RID_SVXDLG_FILTER_WARNING ) ),
-    aOk(                this, CUI_RES(PB_OK               )),
-    aCancel(            this, CUI_RES(PB_CANCEL           )),
-    aImage(             this, CUI_RES(IMG_WARNING         )),
-    aFilterWarningFT(   this, CUI_RES(FT_FILTER_WARNING   ))
-{
-    FreeResource();
-    aImage.SetImage(WarningBox::GetStandardImage());
-}
-// ----------------------------------------------------------------------
-void    FilterWarningDialog_Impl::SetFilterName(const String& rFilterUIName)
-{
-    String sTmp(aFilterWarningFT.GetText());
-    sTmp.SearchAndReplaceAscii("%1", rFilterUIName);
-    aFilterWarningFT.SetText(sTmp);
-}
 // ----------------------------------------------------------------------
 #ifdef FILTER_WARNING_ENABLED
 class SvxAlienFilterWarningConfig_Impl : public utl::ConfigItem
@@ -324,23 +293,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
     return ( new SfxSaveTabPage( pParent, rAttrSet ) );
 }
 
-/* -----------------------------05.04.01 13:10--------------------------------
-
- ---------------------------------------------------------------------------*/
-OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties)
-{
-    OUString sRet;
-    const PropertyValue* pProperties = rProperties.getConstArray();
-    for(int nProp = 0; nProp < rProperties.getLength(); nProp++)
-    {
-        if(!pProperties[nProp].Name.compareToAscii("UIName"))
-        {
-            pProperties[nProp].Value >>= sRet;
-            break;
-        }
-    }
-    return sRet;
-}
 // -----------------------------------------------------------------------
 bool SfxSaveTabPage::AcceptFilter( USHORT nPos )
 {
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 36fc60e94435..35ca394e2e57 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -51,12 +51,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox CB_LOAD_SETTINGS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS";
         Pos = MAP_APPFONT ( 12 , 11 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Load user-specific settings with the document";
     };
     CheckBox CB_LOAD_DOCPRINTER
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER";
         Pos = MAP_APPFONT ( 12 , 22 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Load printer settings with the document";
@@ -69,6 +71,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_DOCINFO
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO";
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Edit document properties before saving" ;
@@ -82,18 +85,21 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_BACKUP
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP";
         Pos = MAP_APPFONT ( 12 , 52 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Al~ways create backup copy" ;
     };
     CheckBox BTN_AUTOSAVE
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE";
         Pos = MAP_APPFONT ( 12 , 63 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "Save ~AutoRecovery information every" ;
     };
     NumericField ED_AUTOSAVE
     {
+        HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 180 , 62 ) ;
         Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -116,12 +122,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_RELATIVE_FSYS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS";
         Pos = MAP_APPFONT ( 12 , 74 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Save URLs relative to file system" ;
     };
     CheckBox BTN_RELATIVE_INET
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET";
         Pos = MAP_APPFONT ( 12 , 85 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Save URLs relative to internet" ;
@@ -140,6 +148,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_ODF_VERSION
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION";
         Pos = MAP_APPFONT ( 136 , 105 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
@@ -153,12 +162,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_NOPRETTYPRINTING
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING";
         Pos = MAP_APPFONT ( 12 , 120 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Size optimization for ODF format" ;
     };
     CheckBox BTN_WARNALIENFORMAT
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT";
         Pos = MAP_APPFONT ( 12 , 131 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Warn when not saving in ODF or default format" ;
@@ -177,6 +188,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_APP
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
@@ -200,6 +212,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_FILTER
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER";
         Pos = MAP_APPFONT ( 136 , 153 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src
index e4241d4e4bb4..8072c8ff6e23 100644
--- a/cui/source/options/optspell.src
+++ b/cui/source/options/optspell.src
@@ -39,6 +39,7 @@ TabPage RID_SFXPAGE_SPELL
     Text [ en-US ] = "Spellcheck" ;
     PushButton BTN_BOOK
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK";
         Pos = MAP_APPFONT ( 128 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -46,6 +47,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     MultiListBox LB_BOOK
     {
+        HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 103 , 47 ) ;
@@ -62,6 +64,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_CAPS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS";
         Pos = MAP_APPFONT ( 12 , 82 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */
@@ -71,6 +74,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_NUMS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS";
         Pos = MAP_APPFONT ( 12 , 95 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern  : ~W÷rter mit Ziffern  */
@@ -80,6 +84,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_UPLOW
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW";
         Pos = MAP_APPFONT ( 12 , 108 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung  : Gro˜- u. ~Kleinschreibung  */
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 094e23c2e60a..6b271b91c71c 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -47,24 +47,28 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     CheckBox CB_AUTOCHECK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 210, 10 ) ;
         Text [ en-US ] = "~Check for updates automatically" ;
     };
     RadioButton RB_EVERYDAY
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY";
         Pos = MAP_APPFONT ( 18, 27 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;
         Text [ en-US ] = "Every Da~y" ;
     };
     RadioButton RB_EVERYWEEK
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK";
         Pos = MAP_APPFONT ( 18, 40 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;
         Text [ en-US ] = "Every ~Week" ;
     };
     RadioButton RB_EVERYMONTH
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH";
         Pos = MAP_APPFONT ( 18, 53 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;
         Text [ en-US ] = "Every ~Month" ;
@@ -77,12 +81,14 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     PushButton PB_CHECKNOW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW";
         Pos = MAP_APPFONT ( 12, 82 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         Text [ en-US ] = "Check ~now" ;
     };
     CheckBox CB_AUTODOWNLOAD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD";
         Pos = MAP_APPFONT ( 12, 130 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;
         Text [ en-US ] = "~Download updates automatically" ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     PushButton PB_CHANGEPATH
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH";
         Pos = MAP_APPFONT ( 162, 151 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         Text [ en-US ] = "Ch~ange..." ;
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 7613978bee32..0408c5ecabe3 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -115,13 +115,6 @@ namespace offapp
     {
         return m_pImpl->getDriverImplNames().end();
     }
-
-    //--------------------------------------------------------------------
-    sal_Int32 ODriverEnumeration::size() const throw()
-    {
-        return m_pImpl->getDriverImplNames().size();
-    }
-
 //........................................................................
 }   // namespace offapp
 //........................................................................
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index b1dd5651cf35..4c5471f2280d 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -64,7 +64,6 @@ namespace offapp
 
         const_iterator  begin() const throw();
         const_iterator  end() const throw();
-        sal_Int32 size() const throw();
     };
 
 //........................................................................
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index de7d7b23dc37..4e946bfbfd9a 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -61,6 +61,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_SAVESENDDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS";
         Pos = MAP_APPFONT( COL_2, ROW_2 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When saving or sending";
@@ -72,6 +73,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_SIGNDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS";
         Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_2 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When signing";
@@ -83,6 +85,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_PRINTDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS";
         Pos = MAP_APPFONT( COL_2, ROW_3 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When printing";
@@ -94,6 +97,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_CREATEPDF
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF";
         Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_3 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When creating PDF files";
@@ -111,6 +115,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_REMOVEINFO
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO";
         Pos = MAP_APPFONT( COL_1, ROW_5 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Remove personal information on saving";
@@ -122,6 +127,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_RECOMMENDPWD
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD";
         Pos = MAP_APPFONT( COL_1, ROW_6 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Recommend password protection on saving";
@@ -133,6 +139,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_CTRLHYPERLINK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK";
         Pos = MAP_APPFONT( COL_1, ROW_7 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Ctrl-click required to follow hyperlinks";
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 880f8d263c6b..581ab33ad467 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <tools/rcid.h>
 #include <tools/shl.hxx>
+#include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -2709,22 +2710,6 @@ short OfaTreeOptionsDialog::Execute()
 // class ExtensionsTabPage -----------------------------------------------
 
 ExtensionsTabPage::ExtensionsTabPage(
-    Window* pParent, const ResId& rResId, const rtl::OUString& rPageURL,
-    const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
-
-    TabPage( pParent, rResId ),
-
-    m_sPageURL          ( rPageURL ),
-    m_sEventHdl         ( rEvtHdl ),
-    m_xWinProvider      ( rProvider ),
-    m_bIsWindowHidden   ( false )
-
-{
-}
-
-// -----------------------------------------------------------------------
-
-ExtensionsTabPage::ExtensionsTabPage(
     Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL,
     const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
 
@@ -2862,15 +2847,3 @@ void ExtensionsTabPage::SavePage()
 {
     DispatchAction( C2U("ok") );
 }
-
-// -----------------------------------------------------------------------
-
-void ExtensionsTabPage::HideWindow()
-{
-    if ( !m_bIsWindowHidden && m_xPage.is() )
-    {
-        m_xPage->setVisible( sal_False );
-        m_bIsWindowHidden = true;
-    }
-}
-
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index cba8cd1e411b..b845bf29316d 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -63,6 +63,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
     };
     PushButton PB_BACK
     {
+        HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
         Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 5c5dcdae4ade..c52168fb1ab6 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -311,10 +311,8 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
             ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
             ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
 
-            ::comphelper::DocPasswordRequest* pPasswordRequest
-                  = new ::comphelper::DocPasswordRequest(
-                      ::comphelper::DocPasswordRequestType_STANDARD,
-                      task::PasswordRequestMode_PASSWORD_CREATE, aURL );
+            ::comphelper::SimplePasswordRequest* pPasswordRequest
+                  = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE );
             uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest );
 
             uno::Reference< task::XInteractionHandler > xInteractionHandler(
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 68560c1ecaa7..86c3a52509f6 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -56,18 +56,21 @@ ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
     };
     PushButton PB_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE";
         Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Remove";
     };
     PushButton PB_REMOVEALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL";
         Pos = MAP_APPFONT ( COL_1 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Remove All";
     };
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE";
         Pos = MAP_APPFONT ( COL_C , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Change Password...";
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 807bfdb56132..acaa9234b87d 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -57,6 +57,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_HORALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 25  );
         Size = MAP_APPFONT ( 100 , 60 );
@@ -80,6 +81,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     MetricField ED_INDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 118 , 25 ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_VERALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN";
         Border = TRUE;
         Pos = MAP_APPFONT ( 160 , 25  );
         Size = MAP_APPFONT ( 88 , 60 );
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_TXTSTACKED
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED";
         Pos = MAP_APPFONT ( 133 , 54 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         TabStop = TRUE ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     NumericField NF_DEGREES
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 65 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -165,6 +170,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_ASIAN_VERTICAL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL";
         Pos = MAP_APPFONT ( 143 , 68 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         TabStop = TRUE ;
@@ -178,18 +184,21 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_WRAP
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP";
         Pos = MAP_APPFONT ( 12 , 126 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Wrap text automatically" ;
     };
     TriStateBox BTN_HYPH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH";
         Pos = MAP_APPFONT ( 22 , 139 ) ;
         Size = MAP_APPFONT ( 226 , 10 ) ;
         Text [ en-US ] = "Hyphenation ~active";
     };
     TriStateBox BTN_SHRINK
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK";
         Pos = MAP_APPFONT( 12, 152 );
         Size = MAP_APPFONT( 236, 10 );
         Text [ en-US ] = "~Shrink to fit cell size";
@@ -202,6 +211,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_FRAMEDIR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR";
         Pos = MAP_APPFONT( 78 , 168 );
         Size = MAP_APPFONT( 170 , 50 );
         Border = TRUE;
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 9db3dbeb43b4..d698a8f8aa47 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -173,6 +173,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
     };
     PushButton PB_EDIT
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT";
         Pos = MAP_APPFONT ( 6 , 162 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -247,7 +248,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
 
 ModalDialog RID_OFADLG_PRCNT_SET
 {
-    HelpID = SID_AUTOFORMAT ;
+    HelpID = CMD_SID_AUTOFORMAT ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 155 , 43 ) ;
@@ -273,6 +274,7 @@ ModalDialog RID_OFADLG_PRCNT_SET
     };
     MetricField ED_RIGHT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -312,6 +314,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     Edit ED_SHORT
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT";
         Pos = MAP_APPFONT ( 7 , 13 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
         Border = TRUE ;
@@ -326,6 +329,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     Edit ED_REPLACE
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE";
         Pos = MAP_APPFONT ( 71 , 13 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -333,6 +337,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     CheckBox CB_TEXT_ONLY
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY";
         Pos = MAP_APPFONT ( 140 , 3 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         TabStop = TRUE ;
@@ -340,6 +345,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     PushButton PB_NEW_REPLACE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE";
         Pos = MAP_APPFONT ( 198 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -347,6 +353,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     PushButton PB_DELETE_REPLACE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE";
         Pos = MAP_APPFONT ( 198 , 32 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -385,6 +392,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     Edit ED_ABBREV
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV";
         Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         TabStop = TRUE ;
@@ -392,6 +400,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     ListBox LB_ABBREV
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV";
         Pos = MAP_APPFONT ( 7 , 30 ) ;
         Size = MAP_APPFONT ( 123 , 58 ) ;
         TabStop = TRUE ;
@@ -401,6 +410,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_NEWABBREV
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV";
         Pos = MAP_APPFONT ( 198 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -409,6 +419,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_DELABBREV
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV";
         Pos = MAP_APPFONT ( 198 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -417,6 +428,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     CheckBox CB_AUTOABBREV
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV";
         Pos = MAP_APPFONT ( 137 , 78 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "~AutoInclude";
@@ -431,6 +443,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     Edit ED_DOUBLE_CAPS
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS";
         Pos = MAP_APPFONT ( 7 , 105 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         TabStop = TRUE ;
@@ -438,6 +451,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     ListBox LB_DOUBLE_CAPS
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS";
         Pos = MAP_APPFONT ( 7 , 120 ) ;
         Size = MAP_APPFONT ( 123 , 59 ) ;
         TabStop = TRUE ;
@@ -447,6 +461,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_NEWDOUBLECAPS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS";
         Pos = MAP_APPFONT ( 198 , 105 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -454,6 +469,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_DELDOUBLECAPS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS";
         Pos = MAP_APPFONT ( 198 , 122 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -461,6 +477,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     CheckBox CB_AUTOCAPS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS";
         Pos = MAP_APPFONT ( 137 , 169 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "A~utoInclude";
@@ -509,8 +526,9 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
         Size = MAP_APPFONT ( 122 , 8 ) ;
         Text [ en-US ] = "Single quotes" ;
     };
-    Checkbox CB_SGL_TYPO
+    CheckBox CB_SGL_TYPO
     {
+            HelpId = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO";
         Pos = MAP_APPFONT ( 7 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         Text [ en-US ] = "Repla~ce" ;
@@ -523,6 +541,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_STARTQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE";
         Pos = MAP_APPFONT ( 10 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
@@ -541,6 +560,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_ENDQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE";
         Pos = MAP_APPFONT ( 10 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
@@ -553,6 +573,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_STD
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD";
         Pos = MAP_APPFONT ( 7 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -566,6 +587,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     CheckBox CB_TYPO
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO";
         Pos = MAP_APPFONT ( 137 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         TabStop = TRUE ;
@@ -579,6 +601,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_STARTQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE";
         Pos = MAP_APPFONT ( 140 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
@@ -597,6 +620,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_ENDQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE";
         Pos = MAP_APPFONT ( 140 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
@@ -609,6 +633,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_DBL_STD
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD";
         Pos = MAP_APPFONT ( 137 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -642,30 +667,35 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     Hide = TRUE ;
     CheckBox CB_ACTIV
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV";
         Pos = MAP_APPFONT( 4, 3 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Enable word ~completion";
     };
     CheckBox CB_APPEND_SPACE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE";
         Pos = MAP_APPFONT( 10, 17 );
         Size = MAP_APPFONT( 110, 10 );
         Text [ en-US ] = "~Append space";
     };
     CheckBox CB_AS_TIP
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP";
         Pos = MAP_APPFONT( 10, 31 );
         Size = MAP_APPFONT( 110, 10 );
         Text [ en-US ] = "~Show as tip";
     };
     CheckBox CB_COLLECT
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT";
         Pos = MAP_APPFONT( 4, 45 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "C~ollect words";
     };
     CheckBox CB_REMOVE_LIST
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST";
         Pos = MAP_APPFONT( 10, 59 );
         Size = MAP_APPFONT( 110, 40 );
         WordBreak = TRUE;
@@ -679,6 +709,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     ListBox DCB_EXPAND_KEY
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY";
         Pos = MAP_APPFONT( 4, 113 );
         Size = MAP_APPFONT( 116, 60 );
         TabStop = TRUE;
@@ -694,6 +725,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     NumericField NF_MIN_WORDLEN
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN";
         Border = TRUE;
         Pos = MAP_APPFONT( 4, 140 );
         Size = MAP_APPFONT( 30, 12 );
@@ -716,6 +748,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     NumericField NF_MAX_ENTRIES
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES";
         Border = TRUE;
         Pos = MAP_APPFONT( 4, 167 );
         Size = MAP_APPFONT( 30, 12 );
@@ -732,6 +765,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     MultiListBox LB_ENTRIES
     {
+        HelpID = "cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES";
         Pos = MAP_APPFONT( 127, 3 );
         Size = MAP_APPFONT( 121, 158 );
         TabStop = TRUE;
@@ -742,6 +776,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     PushButton PB_ENTRIES
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES";
         Pos = MAP_APPFONT( 127, 165 );
         Size = MAP_APPFONT( 121, 14 );
         TabStop = TRUE ;
@@ -767,6 +802,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
 
     CheckBox CB_SMARTTAGS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_SMARTTAG_OPTIONS:CB_SMARTTAGS";
         Pos = MAP_APPFONT( 4, 3 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Label text with smart tags";
@@ -789,6 +825,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
 
     PushButton PB_SMARTTAGS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_SMARTTAG_OPTIONS:PB_SMARTTAGS";
         Pos = MAP_APPFONT ( 188 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Properties...";
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index 7f413f116aff..6d7c74e9b330 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_SELECTOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 33 , 3 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_TBL_BOX
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_PARA_BOX
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -140,6 +143,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     MetricField MF_COL_TRANS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 218 , 74 + RSC_SP_CTRL_Y ) ;
         Size = MAP_APPFONT ( 30 , 12) ;
@@ -165,6 +169,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     PushButton BTN_BROWSE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -172,6 +177,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     CheckBox BTN_LINK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT + 60 + 2*RSC_SP_CTRL_X, 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 3 ) ;
         Size = MAP_APPFONT ( 78 , 10 ) ;
@@ -193,6 +199,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_POSITION
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 89 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -200,6 +207,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_AREA
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 103 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -208,6 +216,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_TILE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 117 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -231,6 +240,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     MetricField MF_GRAPH_TRANS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_GRAPH_TRANS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 168 ) ;
         Size = MAP_APPFONT ( 30 , 12) ;
@@ -254,6 +264,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     CheckBox BTN_PREVIEW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW";
         Pos = MAP_APPFONT ( 170 , 23 + 4 + 139 + RSC_SP_CTRL_GROUP_Y ) ;
         Size = MAP_APPFONT ( 141 , 10 ) ;
         Text [ en-US ] = "Pre~view" ;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 2d554e3dca7b..0c1c1c7b269c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -155,17 +155,6 @@ Color TpBorderRGBColor( ColorData aColorData )
 }
 
 // -----------------------------------------------------------------------
-
-Color TpBorderRGBColor( const Color& rColor )
-{
-    Color aRGBColor( rColor.GetRed(),
-                     rColor.GetGreen(),
-                     rColor.GetBlue() );
-
-    return( aRGBColor );
-}
-
-// -----------------------------------------------------------------------
 void lcl_SetDecimalDigitsTo1(MetricField& rField)
 {
     sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 811f5429aeb7..4fc781943d3a 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -93,6 +93,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_LINESTYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 25 ) ;
         Size = MAP_APPFONT ( 74 , 66 ) ;
@@ -105,6 +106,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_LINECOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 106 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -125,6 +127,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 14 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -146,6 +149,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 30 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -167,6 +171,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 46 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -188,6 +193,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 62 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -203,6 +209,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox CB_SYNC
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC";
         Pos = MAP_APPFONT ( 177 , 78 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "Synchronize";
@@ -236,6 +243,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField ED_SHADOWSIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 144 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -257,6 +265,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_SHADOWCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 144 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -278,6 +287,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox  CB_MERGEWITHNEXT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Hide = TRUE;
@@ -285,6 +295,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox  CB_MERGEADJACENTBORDERS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Hide = TRUE;
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 565ce58725ab..0e9039b0d5b1 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -283,13 +283,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot,
     return new FrameLineConnection( nSlot, new FrameSelectorWrapper( rFrameSel, eBorder ), nFlags );
 }
 
-sfx::ItemConnectionBase* CreateFrameBoxConnection( USHORT /*nBoxSlot*/, USHORT /*nBoxInfoSlot*/,
-        FrameSelector& /*rFrameSel*/, FrameBorderType /*eBorder*/, sfx::ItemConnFlags /*nFlags*/ )
-{
-    DBG_ERRORFILE( "svx::CreateFrameBoxConnection - not implemented" );
-    return 0;
-}
-
 sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
         MetricField& rMfLeft, MetricField& rMfRight,
         MetricField& rMfTop, MetricField& rMfBottom,
diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index a3d253af8c77..873a56e4fd3b 100644
--- a/cui/source/tabpages/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
@@ -48,13 +48,6 @@ sfx::ItemConnectionBase* CreateFrameLineConnection( USHORT nSlot,
         FrameSelector& rFrameSel, FrameBorderType eBorder,
         sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
 
-/** Creates an item connection object that connects an SvxBoxItem and an
-    SvxBoxInfoItem with an svx::FrameSelector control. */
-sfx::ItemConnectionBase* CreateFrameBoxConnection(
-        USHORT nBoxSlot, USHORT nBoxInfoSlot,
-        FrameSelector& rFrameSel, FrameBorderType eBorder,
-        sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT );
-
 /** Creates an item connection object that connects an SvxMarginItem with the
     controls of the SvxBorderTabPage. */
 sfx::ItemConnectionBase* CreateMarginConnection( const SfxItemSet& rItemSet,
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1f166b8f8d41..560074c4e80f 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1523,47 +1523,6 @@ void SvxCharNamePage::ResetColor_Impl( const SfxItemSet& rSet )
 
 // -----------------------------------------------------------------------
 
-BOOL SvxCharNamePage::FillItemSetColor_Impl( SfxItemSet& rSet )
-{
-    USHORT nWhich = GetWhich( SID_ATTR_CHAR_COLOR );
-    const SvxColorItem* pOld = (const SvxColorItem*)GetOldItem( rSet, SID_ATTR_CHAR_COLOR );
-    const SvxColorItem* pItem = NULL;
-    BOOL bChanged = TRUE;
-    const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
-    const SfxItemSet& rOldSet = GetItemSet();
-
-    Color aSelectedColor;
-    if ( m_pColorLB->GetSelectEntry() == m_pImpl->m_aTransparentText )
-        aSelectedColor = Color( COL_TRANSPARENT );
-    else
-        aSelectedColor = m_pColorLB->GetSelectEntryColor();
-
-    if ( pOld && pOld->GetValue() == aSelectedColor )
-        bChanged = FALSE;
-
-    if ( !bChanged )
-        bChanged = ( m_pColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND );
-
-    if ( !bChanged && pExampleSet &&
-         pExampleSet->GetItemState( nWhich, FALSE, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET &&
-         ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor )
-        bChanged = TRUE;
-
-    BOOL bModified = FALSE;
-
-    if ( bChanged && m_pColorLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
-    {
-        rSet.Put( SvxColorItem( aSelectedColor, nWhich ) );
-        bModified = TRUE;
-    }
-    else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, FALSE ) )
-        CLEARTITEM;
-
-    return bModified;
-}
-
-// -----------------------------------------------------------------------
-
 IMPL_LINK( SvxCharNamePage, UpdateHdl_Impl, Timer*, EMPTYARG )
 {
     UpdatePreview_Impl();
@@ -1656,7 +1615,6 @@ BOOL SvxCharNamePage::FillItemSet( SfxItemSet& rSet )
     BOOL bModified = FillItemSet_Impl( rSet, Western );
     bModified |= FillItemSet_Impl( rSet, Asian );
     bModified |= FillItemSet_Impl( rSet, Ctl );
-//! bModified |= FillItemSetColor_Impl( rSet );
     return bModified;
 }
 
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 9673fc950f3f..60c511a87f61 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 25 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_NAME_NOCJK
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 17 );
         Size = MAP_APPFONT ( 112 , 71 );
@@ -86,6 +88,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 25 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -101,6 +104,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_STYLE_NOCJK
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 130 , 17 );
         Size = MAP_APPFONT ( 72 , 71 );
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_WEST_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 25 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_WEST_SIZE_NOCJK
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 208 , 17 );
         Size = MAP_APPFONT ( 40 , 71 );
@@ -156,6 +162,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_WEST_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 25 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_WEST_LANG_NOCJK
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 130 , 105 );
         Size = MAP_APPFONT ( 72 , 72 );
@@ -186,6 +194,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_EAST_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 65 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -200,6 +209,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_EAST_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 65 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -221,6 +231,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_EAST_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 65 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -235,6 +246,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_EAST_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 65 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -256,6 +268,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_CTL_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 105 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -270,6 +283,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_CTL_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 105 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -291,6 +305,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_CTL_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 105 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -305,6 +320,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_CTL_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 105 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -339,6 +355,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_COLOR2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 105 );
         Size = MAP_APPFONT ( 58 , 100 );
@@ -370,6 +387,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_FONTCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 10 , 15 );
         Size = MAP_APPFONT ( 82 , 72 );
@@ -384,6 +402,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_EFFECTS2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2";
         Pos = MAP_APPFONT ( 10 , 44 ) ;
         Size = MAP_APPFONT ( 82 , 56 ) ;
         DropDown = TRUE;
@@ -404,6 +423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_RELIEF
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF";
         Pos = MAP_APPFONT ( 10 , 73 ) ;
         Size = MAP_APPFONT ( 82 , 56 ) ;
         DropDown = TRUE;
@@ -416,18 +436,21 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_OUTLINE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE";
         Pos = MAP_APPFONT ( 10 , 93 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Out~line" ;
     };
     TriStateBox CB_SHADOW
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW";
         Pos = MAP_APPFONT ( 10 , 107 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Sha~dow" ;
     };
     TriStateBox CB_BLINKING
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING";
         Pos = MAP_APPFONT ( 10 , 121 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Hide = TRUE;
@@ -435,6 +458,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_CHARHIDDEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN";
         Pos = MAP_APPFONT ( 10 , 135 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "H~idden" ;
@@ -453,6 +477,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_OVERLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 15 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -487,6 +512,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_OVERLINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 15 );
         Size = MAP_APPFONT ( 68 , 100 );
@@ -501,6 +527,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_STRIKEOUT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 44 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -524,6 +551,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_UNDERLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 73 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -558,6 +586,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_UNDERLINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 73 );
         Size = MAP_APPFONT ( 68 , 100 );
@@ -566,6 +595,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     CheckBox CB_INDIVIDUALWORDS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS";
         Pos = MAP_APPFONT ( 110 , 93 );
         Size = MAP_APPFONT ( 68 , 10 );
         TabStop = TRUE;
@@ -584,6 +614,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_EMPHASIS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 128 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -606,6 +637,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_POSITION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 128 );
         Size = MAP_APPFONT ( 68 , 48 );
@@ -680,6 +712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_HIGHPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS";
         Pos = MAP_APPFONT ( 12 , 16 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Superscript" ;
@@ -687,6 +720,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_NORMALPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS";
         Pos = MAP_APPFONT ( 12 , 30 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Normal" ;
@@ -694,6 +728,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_LOWPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS";
         Pos = MAP_APPFONT ( 12 , 44 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Subscript" ;
@@ -707,6 +742,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_HIGHLOW
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW";
         Border = TRUE;
         Pos = MAP_APPFONT ( 136 , 14 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -723,6 +759,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_HIGHLOW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW";
         Pos = MAP_APPFONT ( 172 , 16 );
         Size = MAP_APPFONT ( 76 , 10 );
         Text [ en-US ] = "A~utomatic" ;
@@ -736,6 +773,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_FONTSIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 136 , 30 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -764,6 +802,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_0_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG";
         Pos = MAP_APPFONT ( 12 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -771,6 +810,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_90_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG";
         Pos = MAP_APPFONT ( 62 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -778,6 +818,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_270_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG";
         Pos = MAP_APPFONT ( 112 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -785,6 +826,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_FIT_TO_LINE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE";
         Pos = MAP_APPFONT ( 162 , 70 );
         Size = MAP_APPFONT ( 86 , 10 );
         TabStop = TRUE;
@@ -798,6 +840,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField MF_SCALE_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH";
         Border = TRUE;
         Pos = MAP_APPFONT ( 94 , 84 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -820,6 +863,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     ListBox LB_KERNING2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 111 );
         Size = MAP_APPFONT ( 72 , 48 ) ;
@@ -840,6 +884,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_KERNING2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 112 , 111 );
         Size = MAP_APPFONT ( 40 , 12 );
@@ -853,6 +898,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_PAIRKERNING
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING";
         Pos = MAP_APPFONT ( 156 , 113 );
         Size = MAP_APPFONT ( 92 , 10 );
         Text [ en-US ] = "~Pair kerning" ;
@@ -887,6 +933,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     CheckBox CB_TWOLINES
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES";
         Pos = MAP_APPFONT ( 12 , 14 );
         Size = MAP_APPFONT ( 236 , 10 );
         Text [ en-US ] = "~Write in double lines" ;
@@ -906,6 +953,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     ListBox ED_STARTBRACKET
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET";
         Pos = MAP_APPFONT ( 12 , 52 );
         Size = MAP_APPFONT ( 90 , 72 );
         TabStop = TRUE;
@@ -928,6 +976,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     ListBox ED_ENDBRACKET
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET";
         Pos = MAP_APPFONT ( 108 , 52 );
         Size = MAP_APPFONT ( 90 , 72 );
         TabStop = TRUE;
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index 64623b0cee25..d2fe0796bb26 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     ListBox LB_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 37 , 6 ) ;
         Size = MAP_APPFONT ( 83 , 54 ) ;
@@ -69,6 +70,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 35  ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -91,6 +93,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 51 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -113,6 +116,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_3
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 67 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_HORZ_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 96 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -163,6 +168,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_HORZ_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 128 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_VERT_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 112 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_VERT_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 144 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index 18e38fd5236a..2c6e953e6b71 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_NONE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         Text [ en-US ] = "~None" ;
@@ -56,6 +57,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_LEFT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT";
         Pos = MAP_APPFONT ( 56 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -63,6 +65,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER";
         Pos = MAP_APPFONT ( 105 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Center" ;
@@ -70,6 +73,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_DISTANCE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE";
         Pos = MAP_APPFONT ( 154 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Spacing" ;
@@ -77,6 +81,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_RIGHT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT";
         Pos = MAP_APPFONT ( 203 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Right" ;
@@ -131,6 +136,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_NONE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE";
         Pos = MAP_APPFONT ( 12 , 53  ) ;
         Size = MAP_APPFONT ( 46 , 10 ) ;
         Text [ en-US ] = "N~one" ;
@@ -138,6 +144,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_TOP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP";
         Pos = MAP_APPFONT ( 56 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Top" ;
@@ -145,6 +152,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER";
         Pos = MAP_APPFONT ( 105 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "C~enter" ;
@@ -152,6 +160,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_DISTANCE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE";
         Pos = MAP_APPFONT ( 154 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "S~pacing" ;
@@ -159,6 +168,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_BOTTOM
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM";
         Pos = MAP_APPFONT ( 203 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Bottom" ;
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 74b9e8e5cda0..085e92f2d0c0 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 42 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -83,6 +84,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 58 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -106,6 +108,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 42 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -131,6 +134,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 58 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -148,12 +152,14 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     RadioButton RB_SIZECONST
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "Keep image si~ze" ;
     };
     RadioButton RB_ZOOMCONST
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Check = TRUE ;
@@ -180,6 +186,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_WIDTHZOOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 87 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_HEIGHTZOOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 103 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -239,6 +247,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 132 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -264,6 +273,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 148 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -286,6 +296,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     PushButton PB_ORGSIZE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE";
         Pos = MAP_APPFONT ( 176 , 143 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index ed13f2de9b49..1e7da5393a2a 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -53,6 +53,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_ABSTAND
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 51  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -73,6 +74,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_WINKEL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 51  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -96,6 +98,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_ANSATZ
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_ANSATZ
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_ANSATZ_REL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -155,6 +160,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_LAENGE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 83  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -169,6 +175,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     CheckBox CB_LAENGE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE";
         Pos = MAP_APPFONT ( 106 , 84  ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 5cfeb0f4c8be..c18ebf6f2a68 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -237,26 +237,6 @@ void _SfxMacroTabPage::ScriptChanged( const String& aLangName )
     EnableButtons( aLangName );
 }
 
-void _SfxMacroTabPage::SetGetRangeLink( FNGetRangeHdl pFn )
-{
-    mpImpl->fnGetRange = pFn;
-}
-
-FNGetRangeHdl _SfxMacroTabPage::GetGetRangeLink() const
-{
-    return mpImpl->fnGetRange;
-}
-
-void _SfxMacroTabPage::SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn )
-{
-    mpImpl->fnGetMacroOfRange = pFn;
-}
-
-FNGetMacrosOfRangeHdl _SfxMacroTabPage::GetGetMacrosOfRangeLink() const
-{
-    return mpImpl->fnGetMacroOfRange;
-}
-
 BOOL _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
 {
     SvxMacroItem aItem( GetWhich( aPageRg[0] ) );
@@ -313,11 +293,6 @@ void _SfxMacroTabPage::Reset( const SfxItemSet& rSet )
         rListBox.SetCurEntry( pE );
 }
 
-void _SfxMacroTabPage::SetReadOnly( BOOL bSet )
-{
-    mpImpl->bReadOnly = bSet;
-}
-
 BOOL _SfxMacroTabPage::IsReadOnly() const
 {
     return mpImpl->bReadOnly;
@@ -392,12 +367,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
     return 0;
 }
 
-IMPL_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit*, EMPTYARG )
-{
-    pThis->EnableButtons( DEFINE_CONST_UNICODE("JavaScript") );
-    return 0;
-}
-
 IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
 {
     _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
@@ -580,24 +549,6 @@ void _SfxMacroTabPage::FillEvents()
     }
 }
 
-void _SfxMacroTabPage::SelectEvent( const String & /*rEventName*/, USHORT nEventId )
-{
-    SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-    ULONG               nEntryCnt = rListBox.GetEntryCount();
-
-    for( ULONG n = 0 ; n < nEntryCnt ; ++n )
-    {
-        SvLBoxEntry*    pE = rListBox.GetEntry( n );
-        if( pE && ( USHORT ) ( ULONG ) pE->GetUserData() == nEventId )
-        {
-            rListBox.SetCurEntry( pE );
-            rListBox.MakeVisible( pE );
-            break;
-        }
-    }
-}
-
-
 SvStringsDtor* __EXPORT _ImpGetRangeHdl( _SfxMacroTabPage* /*pTbPg*/, const String& rLanguage )
 {
     SvStringsDtor* pNew = new SvStringsDtor;
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index 4f5d78ffe795..9a5bb519d460 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -32,6 +32,7 @@
 
 TabPage RID_SVXPAGE_EVENTASSIGN
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_EVENTASSIGN";
     Hide = TRUE ;
     SVLook = TRUE ;
     DialogControl = TRUE ;
@@ -89,6 +90,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN";
         Pos = MAP_APPFONT ( COL4 , ROW0  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
          // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE";
         Pos = MAP_APPFONT ( COL4 , ROW2  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Disable = TRUE ;
@@ -106,6 +109,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     ListBox LB_SCRIPTTYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE";
         Pos = MAP_APPFONT ( COL4 , ROW4  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 60 ) ;
         // en-US was missing
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index 79c46b13079b..f01c2765ce0e 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_LINE_DIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 14  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE_OVERHANG
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 30  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -99,6 +101,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE_DIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 46  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -121,6 +124,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE1_LEN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 62 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -143,6 +147,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE2_LEN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 78 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -159,6 +164,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_BELOW_REF_EDGE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE";
         Pos = MAP_APPFONT ( 12 , 96  ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         TabStop = TRUE ;
@@ -173,6 +179,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_DECIMALPLACES
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 110 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_AUTOPOSV
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV";
         Pos = MAP_APPFONT ( 154 , 54 ) ;
         Size = MAP_APPFONT ( 101 , 10 ) ;
         TabStop = TRUE ;
@@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_AUTOPOSH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH";
         Pos = MAP_APPFONT ( 154 , 68  ) ;
         Size = MAP_APPFONT ( 101 , 10 ) ;
         TabStop = TRUE ;
@@ -227,6 +236,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_PARALLEL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL";
         Pos = MAP_APPFONT ( 138 , 82 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -234,6 +244,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_SHOW_UNIT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT";
         Pos = MAP_APPFONT ( 138 , 96  ) ;
         Size = MAP_APPFONT ( 64+40 , 10 ) ;
         TabStop = TRUE ;
@@ -241,6 +252,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     ListBox LB_UNIT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 154 , 110 ) ;
         Size = MAP_APPFONT ( 60 , 80+35 ) ;
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 2538b196932c..b3f2d22fd204 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     ListBox LB_CATEGORY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 71 ) ;
@@ -72,6 +73,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     Edit ED_FORMAT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 147 ) ;
         Size = MAP_APPFONT ( 200 , 12 ) ;
@@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     Edit ED_COMMENT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 163 ) ;
@@ -99,6 +102,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
 
     ListBox LB_CURRENCY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 71 ) ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     NumericField ED_DECIMALS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 84 , 102 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -147,6 +152,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     NumericField ED_LEADZEROES
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 84 , 118 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -160,12 +166,14 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox BTN_NEGRED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED";
         Pos = MAP_APPFONT ( 133 , 104 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Negative numbers red" ;
     };
     CheckBox BTN_THOUSAND
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND";
         Pos = MAP_APPFONT ( 133 , 120 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Thousands separator" ;
@@ -184,6 +192,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE";
         Border = TRUE ;
         Sort = TRUE ;
         Pos = MAP_APPFONT ( 178 , 14 ) ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox CB_SOURCEFORMAT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT";
         Pos = MAP_APPFONT ( 178 , 42 ) ;
         Size = MAP_APPFONT ( 76 , 10 ) ;
         Text [ en-US ] = "So~urce format" ;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9bf88e151770..5b2bb4474573 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -939,28 +939,6 @@ void SvxNumPickTabPage::PageCreated(SfxAllItemSet aSet)
         SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
 }
 //end of CHINA001
-/*-----------------07.02.97 15.59-------------------
-
---------------------------------------------------*/
-void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
-                        const OUString& rBulletChar, const OUString& rText, const OUString& rFontName,
-                        Point& rLeft, Font& rRuleFont, const Font& rTextFont)
-{
-
-    if(NumberingType::CHAR_SPECIAL == nNumberingType )
-    {
-        rRuleFont.SetStyleName(rFontName);
-        pVDev->SetFont(rRuleFont);
-        pVDev->DrawText(rLeft, rBulletChar);
-        rLeft.X() += pVDev->GetTextWidth(rBulletChar);
-    }
-    else
-    {
-        pVDev->SetFont(rTextFont);
-        pVDev->DrawText(rLeft, rText);
-        rLeft.X() += pVDev->GetTextWidth(rText);
-    }
-}
 
 /**************************************************************************/
 /*                                                                        */
@@ -2269,7 +2247,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     Size                    aSize;
     sal_Bool                bSucc(sal_False);
     SvxOpenGraphicDialog    aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
-//  aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
 
     if(MN_GALLERY_ENTRY <= nItemId )
     {
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 323b5cdd6ba6..e66e3dc2dd98 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -128,6 +128,7 @@ TabPage RID_SVXPAGE_PICK_BMP
     };
     CheckBox CB_LINKED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED";
         Pos = MAP_APPFONT ( 9 , 169 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -161,6 +162,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MultiListBox LB_LEVEL
     {
+        HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 26 , 154 ) ;
         TabStop = TRUE ;
@@ -182,6 +184,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_FMT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT";
         Pos = MAP_APPFONT ( 103 , 25 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
         TabStop = TRUE ;
@@ -225,6 +228,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     Edit ED_PREFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 41 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -241,6 +245,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     Edit ED_SUFFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 57 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -256,6 +261,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_CHARFMT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT";
         TabStop = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -270,6 +276,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_BUL_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR";
         TabStop = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -285,6 +292,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_BUL_REL_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE";
         Pos = MAP_APPFONT ( 103 , 89 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -307,6 +315,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     NumericField NF_ALL_LEVEL
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 89 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -329,6 +338,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     NumericField ED_START
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 105 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -351,6 +361,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_ALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ALIGN";
         Pos = MAP_APPFONT ( 103 , 133 ) ;
         Size = MAP_APPFONT ( 40 , 40 ) ;
         TabStop = TRUE ;
@@ -369,6 +380,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     PushButton PB_BULLET
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 105 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
@@ -384,6 +396,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MenuButton MB_BITMAP
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 41 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -416,6 +429,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH";
         Pos = MAP_APPFONT ( 103 , 59 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -442,6 +456,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT";
         Pos = MAP_APPFONT ( 103 , 75 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -461,6 +476,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     CheckBox CB_RATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 50 , 91 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
@@ -475,6 +491,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_ORIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 103 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
@@ -502,6 +519,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     CheckBox CB_SAME_LEVEL
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL";
         Pos = MAP_APPFONT ( 53 , 167 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         Text [ en-US ] = "~Consecutive numbering" ;
@@ -537,6 +555,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MultiListBox LB_LEVEL
     {
+        HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 26 , 154 ) ;
         TabStop = TRUE ;
@@ -559,6 +578,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_BORDERDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -577,6 +597,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     CheckBox CB_RELATIVE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "Relati~ve" ;
@@ -589,6 +610,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_INDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -613,6 +635,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_NUMDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -637,6 +660,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_ALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 40 ) ;
         TabStop = TRUE ;
@@ -656,6 +680,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_LABEL_FOLLOWED_BY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -676,6 +701,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_LISTTAB
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -699,6 +725,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_ALIGN_2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -712,6 +739,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_ALIGNED_AT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -736,6 +764,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_INDENT_AT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -754,6 +783,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     PushButton PB_STANDARD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD";
         Pos = MAP_APPFONT ( 198 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Default" ;
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index c96b43a5a966..5c919f1df17a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_PAPER_SIZE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
         Pos = MAP_APPFONT ( 50 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 64 ) ;
         DropDown = TRUE ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_PAPER_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50, 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -89,6 +91,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_PAPER_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -109,6 +112,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     RadioButton RB_PORTRAIT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
         Pos = MAP_APPFONT ( 50 , 62 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Check = TRUE ;
@@ -116,6 +120,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     RadioButton RB_LANDSCAPE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
         Pos = MAP_APPFONT ( 50 , 74 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Text [ en-US ] = "L~andscape";
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_TEXT_FLOW
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 165 , 58 ) ;
         Size = MAP_APPFONT ( 83 , 50 ) ;
@@ -152,6 +158,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_PAPER_TRAY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY";
         Pos = MAP_APPFONT ( 165 , 72 ) ;
         Size = MAP_APPFONT ( 83 , 50 ) ;
         DropDown = TRUE ;
@@ -172,6 +179,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_LEFT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 101 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -193,6 +201,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_RIGHT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 117 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -214,6 +223,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_TOP_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 133 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -235,6 +245,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_BOTTOM_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 149 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -267,6 +278,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_LAYOUT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170, 101 ) ;
         Size = MAP_APPFONT ( 78 , 44 ) ;
@@ -287,6 +299,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_NUMBER_FORMAT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 117 ) ;
         Size = MAP_APPFONT ( 78 , 64 ) ;
@@ -310,6 +323,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_HORZ
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 175 , 133 ) ;
         Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -317,6 +331,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_VERT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 175 , 147 ) ;
         Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -324,6 +339,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_ADAPT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 113 , 133 ) ;
         Size = MAP_APPFONT ( 135 , 10 ) ;
@@ -332,6 +348,7 @@ TabPage RID_SVXPAGE_PAGE
     /* Registerhaltigkeit (fuer SW) */
     CheckBox CB_REGISTER
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER";
         Pos = MAP_APPFONT ( 113 , 133 ) ;
         Size = MAP_APPFONT ( 135 , 10 ) ;
         Hide = TRUE ;
@@ -346,6 +363,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_REGISTER
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER";
         Pos = MAP_APPFONT ( 122 , 157 ) ;
         Size = MAP_APPFONT ( 126 , 50 ) ;
         DropDown = TRUE ;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 26eccfc0bb3e..0359ef595a87 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -957,13 +957,6 @@ void SvxStdParagraphTabPage::SetPageWidth( USHORT nPageWidth )
 {
     nWidth = nPageWidth;
 }
-/*-----------------16.01.97 18.01-------------------
-
---------------------------------------------------*/
-void SvxStdParagraphTabPage::SetMaxDistance( USHORT nMaxDist )
-{
-    nAbst = nMaxDist;
-}
 
 /*-----------------17.01.97 08.11-------------------
 
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index d52283ceea8f..e7e50842ba1c 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LEFTINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_RIGHTINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_FLINEINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -107,6 +110,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     CheckBox CB_AUTO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO";
         Pos = MAP_APPFONT ( 12 , 61 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Hide = TRUE ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_TOPDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 88 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -149,6 +154,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_BOTTOMDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 104 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -170,6 +176,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     ListBox LB_LINEDIST
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST";
         Pos = MAP_APPFONT ( 12 , 133 ) ;
         Size = MAP_APPFONT ( 55 , 72 ) ;
         DropDown = TRUE ;
@@ -197,6 +204,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LINEDISTPERCENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 133 ) ;
@@ -216,6 +224,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LINEDISTMETRIC
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC";
         Disable = TRUE ;
         Border = TRUE ;
         Hide = TRUE ;
@@ -245,6 +254,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     CheckBox CB_REGISTER
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER";
         Pos = MAP_APPFONT ( 12 , 162 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Hide = TRUE ;
@@ -275,6 +285,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     RadioButton BTN_LEFTALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -282,18 +293,21 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     RadioButton BTN_RIGHTALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "Righ~t" ;
     };
     RadioButton BTN_CENTERALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "~Center" ;
     };
     RadioButton BTN_JUSTIFYALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "Justified" ;
@@ -315,6 +329,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_LASTLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE";
         Pos = MAP_APPFONT ( 105 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 50 ) ;
         DropDown = TRUE ;
@@ -329,6 +344,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     CheckBox CB_EXPAND
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND";
         Pos = MAP_APPFONT ( 20 , 86 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Hide = TRUE ;
@@ -336,6 +352,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     CheckBox CB_SNAP
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP";
         Pos = MAP_APPFONT ( 20 , 100 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Hide = TRUE ;
@@ -363,6 +380,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_VERTALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN";
         Pos = MAP_APPFONT ( 105 , 133 ) ;
         Size = MAP_APPFONT ( 70 , 50 ) ;
         DropDown = TRUE ;
@@ -392,6 +410,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_TEXTDIRECTION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 105 , 165 ) ;
         Size = MAP_APPFONT ( 146 , 50 ) ;
@@ -408,12 +427,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     Size = MAP_APPFONT ( 260 , 185 ) ;
     TriStateBox BTN_HYPHEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "A~utomatically" ;
     };
     NumericField ED_HYPHENBEFORE
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 26 ) ;
@@ -438,6 +459,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_HYPHENAFTER
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 41 ) ;
@@ -469,6 +491,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_MAXHYPH
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 55 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -501,6 +524,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGEBREAK
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 86 ) ;
         Size = MAP_APPFONT ( 61 , 10 ) ;
@@ -515,6 +539,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_BREAKTYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 84 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -534,6 +559,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_BREAKPOSITION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 84 ) ;
         Size = MAP_APPFONT ( 40 , 50 ) ;
@@ -546,6 +572,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGECOLL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL";
          //         Disable = TRUE;
         Pos = MAP_APPFONT (21 , 100 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
@@ -554,6 +581,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_PAGECOLL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 98 , 98 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -569,6 +597,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_PAGENUM
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 98 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -583,6 +612,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_KEEPTOGETHER
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER";
         Pos = MAP_APPFONT ( 12 , 127 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Do not split paragraph" ;
@@ -590,12 +620,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox CB_KEEPTOGETHER
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER";
         Pos = MAP_APPFONT ( 12, 141 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Keep with next paragraph" ;
     };
     TriStateBox BTN_ORPHANS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 155 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -604,6 +636,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_ORPHANS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 134 , 153 ) ;
@@ -628,6 +661,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_WIDOWS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 169 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -636,6 +670,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_WIDOWS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 134 , 167 ) ;
@@ -676,18 +711,21 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     };
     TriStateBox CB_AS_FORBIDDEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Apply list of forbidden characters to the beginning and end of lines";
     };
     TriStateBox CB_AS_HANG_PUNC
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Allow hanging punctuation";
     };
     TriStateBox CB_AS_SCRIPT_SPACE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Apply spacing between Asian, Latin and Complex text";
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index c5fd8e8816e9..f22227ac8061 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH";
         Pos = MAP_APPFONT ( 59 , 14 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT";
         Pos = MAP_APPFONT ( 59 , 30 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE ;
@@ -95,6 +97,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_KEEPRATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO";
         Pos = MAP_APPFONT ( 12 , 45 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
         TabStop = TRUE ;
@@ -114,30 +117,35 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     RadioButton RB_TOPAGE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE";
         Pos = MAP_APPFONT ( 122 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To ~page";
     };
     RadioButton RB_TOPARA
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA";
         Pos = MAP_APPFONT ( 122 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To paragrap~h";
     };
     RadioButton RB_TOCHAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR";
         Pos = MAP_APPFONT ( 122 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To cha~racter";
     };
     RadioButton RB_ASCHAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR";
         Pos = MAP_APPFONT ( 122 , 56 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~As character" ;
     };
     RadioButton RB_TOFRAME
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME";
         Hide = TRUE;
         Pos = MAP_APPFONT ( 122 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -156,6 +164,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     TriStateBox CB_POSITION
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
@@ -163,6 +172,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     TriStateBox CB_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE";
         Pos = MAP_APPFONT ( 122 , 97 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
@@ -183,6 +193,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_HORI
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI";
         Pos = MAP_APPFONT ( 49 , 124 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -197,6 +208,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_HORIBY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 124 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -221,6 +233,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_HORITO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO";
         Pos = MAP_APPFONT ( 183 , 124 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -228,6 +241,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_HORIMIRROR
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -242,6 +256,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_VERT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT";
         Pos = MAP_APPFONT ( 49 , 153 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -256,6 +271,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_VERTBY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 153 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -280,6 +296,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_VERTTO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO";
         Pos = MAP_APPFONT ( 183 , 153 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -287,6 +304,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_FOLLOW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW";
         Pos = MAP_APPFONT ( 12 , 168 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index f5ff6b24ff66..a9e4ccd207a6 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -51,18 +51,21 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     RadioButton RBT_TRANS_OFF
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text [ en-US ] = "~No transparency";
     };
     RadioButton RBT_TRANS_LINEAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR";
         Pos = MAP_APPFONT ( 12 , 28  ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Transparency";
     };
     MetricField MTR_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 26 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -78,6 +81,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     RadioButton RBT_TRANS_GRADIENT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text [ en-US ] = "Gradient";
@@ -90,6 +94,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     ListBox LB_TRGR_GRADIENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 54  ) ;
         Size = MAP_APPFONT ( 53 , 63 ) ;
@@ -113,6 +118,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_CENTER_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 70 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -134,6 +140,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_CENTER_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 86 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -155,6 +162,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 102 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -175,6 +183,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_BORDER
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -196,6 +205,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_START_VALUE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 134 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -217,6 +227,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_END_VALUE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 150 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -261,6 +272,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_AREA_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 108 , 60 ) ;
         DropDown = TRUE;
@@ -278,6 +290,7 @@ TabPage RID_SVXPAGE_AREA
 
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -285,6 +298,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_GRADIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -292,6 +306,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_HATCHING
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -299,6 +314,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_BITMAP
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -331,6 +347,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_STEPCOUNT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT";
         Pos = MAP_APPFONT ( 138 , 15 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         TabStop = TRUE ;
@@ -338,6 +355,7 @@ TabPage RID_SVXPAGE_AREA
     };
     NumericField NUM_FLD_STEPCOUNT
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 208 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -355,6 +373,7 @@ TabPage RID_SVXPAGE_AREA
 
     CheckBox CB_HATCHBCKGRD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD";
         Pos = MAP_APPFONT ( 132 , 3 ) ;
         Size = MAP_APPFONT ( 122 , 10 ) ;
         TabStop = TRUE ;
@@ -362,6 +381,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_HATCHBCKGRDCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 141 , 16 ) ;
         Size = MAP_APPFONT ( 70 , 100 ) ;
@@ -380,6 +400,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_ORIGINAL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL";
         Pos = MAP_APPFONT ( 138 , 15 ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         TabStop = TRUE ;
@@ -387,6 +408,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_SCALE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE";
         Pos = MAP_APPFONT ( 138 , 30 ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         TabStop = TRUE ;
@@ -400,6 +422,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_X_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 212 , 14 ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -424,6 +447,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_Y_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 212 , 29  ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -469,6 +493,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_X_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 87 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -484,6 +509,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_Y_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 102 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -499,6 +525,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_TILE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE";
         Pos = MAP_APPFONT ( 138 , 117  ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
         TabStop = TRUE ;
@@ -506,6 +533,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_STRETCH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH";
         Pos = MAP_APPFONT ( 194 , 117  ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
         TabStop = TRUE ;
@@ -519,18 +547,21 @@ TabPage RID_SVXPAGE_AREA
     };
     RadioButton RBT_ROW
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW";
         Pos = MAP_APPFONT ( 138 , 144  ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Ro~w" ;
     };
     RadioButton RBT_COLUMN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN";
         Pos = MAP_APPFONT ( 138 , 158 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Colu~mn" ;
     };
     MetricField MTR_FLD_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 157 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -560,6 +591,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     TriStateBox TSB_SHOW_SHADOW
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -587,6 +619,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE";
         Pos = MAP_APPFONT ( 65 , 67  ) ;
         Size = MAP_APPFONT ( 47 , 12 ) ;
         Border = TRUE ;
@@ -604,6 +637,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     ListBox LB_SHADOW_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR";
         Pos = MAP_APPFONT ( 65 , 86  ) ;
         Size = MAP_APPFONT ( 57 , 100 ) ;
         DropDown = TRUE ;
@@ -625,6 +659,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     MetricField MTR_SHADOW_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 105  ) ;
         Size = MAP_APPFONT ( 47 , 12 ) ;
@@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 25  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -689,6 +725,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 52  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -717,6 +754,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_LINE_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 134 ) ;
         Size = MAP_APPFONT ( 62 , 62 ) ;
@@ -737,6 +775,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_LINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 161 ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -746,6 +785,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_HATCHINGS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -759,6 +799,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -766,6 +807,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -773,6 +815,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -780,6 +823,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -795,6 +839,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124 ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -843,6 +888,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 115  ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -858,6 +904,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_BACKGROUND_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 142  ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -872,6 +919,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_BITMAPS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -885,6 +933,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -892,6 +941,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -899,6 +949,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_IMPORT
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT";
         Pos = MAP_APPFONT ( 197 , 50  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Import..." ;
@@ -906,6 +957,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -913,6 +965,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -928,6 +981,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -963,6 +1017,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_GRADIENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 14  ) ;
         Size = MAP_APPFONT ( 48, 63 ) ;
@@ -986,6 +1041,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_CENTER_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 30  ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -1007,6 +1063,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_CENTER_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 46  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1028,6 +1085,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 62 ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1048,6 +1106,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_BORDER
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 78  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1069,6 +1128,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_COLOR_FROM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 97 ) ;
         Size = MAP_APPFONT ( 48, 100 ) ;
@@ -1078,6 +1138,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_COLOR_FROM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 113  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1099,6 +1160,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_COLOR_TO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 131 ) ;
         Size = MAP_APPFONT ( 48, 100 ) ;
@@ -1108,6 +1170,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_COLOR_TO
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 147 ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1123,6 +1186,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_GRADIENTS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -1136,6 +1200,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -1143,6 +1208,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -1150,6 +1216,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -1157,6 +1224,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1172,6 +1240,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1208,6 +1277,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 14  ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -1221,6 +1291,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 30  ) ;
         Size = MAP_APPFONT ( 76 , 100 ) ;
@@ -1258,6 +1329,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ListBox LB_COLORMODEL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 71 ) ;
         Size = MAP_APPFONT ( 34 , 12 ) ;
@@ -1277,6 +1349,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 87 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1296,6 +1369,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 103 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1315,6 +1389,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_3
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 119 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1334,6 +1409,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_4
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 135 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1347,6 +1423,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
@@ -1354,6 +1431,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_WORK_ON
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON";
         Pos = MAP_APPFONT ( 197 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -1361,6 +1439,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -1368,6 +1447,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197, 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify" ;
@@ -1375,6 +1455,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1390,6 +1471,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index e850b87c579b..4e40debbee6d 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_LINE_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 25  ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -70,6 +71,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 52  ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_LINE_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 79  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -108,6 +111,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_LINE_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 106  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_START_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 25  ) ;
         Size = MAP_APPFONT ( 57 , 99 ) ;
@@ -150,6 +155,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_END_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 191 , 25  ) ;
         Size = MAP_APPFONT ( 57 , 100 ) ;
@@ -165,6 +171,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_START_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 52  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -182,6 +189,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_END_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 191 , 52  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -199,6 +207,7 @@ TabPage RID_SVXPAGE_LINE
     };
     TriStateBox TSB_CENTER_START
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START";
         Pos = MAP_APPFONT ( 130 , 68  ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "Ce~nter" ;
@@ -206,6 +215,7 @@ TabPage RID_SVXPAGE_LINE
     };
     TriStateBox TSB_CENTER_END
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END";
         Pos = MAP_APPFONT ( 191 , 68  ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "C~enter" ;
@@ -213,6 +223,7 @@ TabPage RID_SVXPAGE_LINE
     };
     CheckBox CBX_SYNCHRONIZE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE";
         // #116827#
         // Pos = MAP_APPFONT ( 130 , 107  ) ;
         Pos = MAP_APPFONT ( 130 , 68 + (16 - 4) ) ;
@@ -238,6 +249,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_EDGE_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 25 + (16 * 6) - 4 ) ;
         Size = MAP_APPFONT ( 57 , 99 ) ;
@@ -273,6 +285,7 @@ TabPage RID_SVXPAGE_LINE
 
     MenuButton MB_SYMBOL_BITMAP
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 130 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -319,6 +332,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MF_SYMBOL_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH";
         Pos = MAP_APPFONT ( 191 , 30  );
         Size = MAP_APPFONT ( 57 , 12 ) ;
         Border = TRUE ;
@@ -345,6 +359,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MF_SYMBOL_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT";
         Pos = MAP_APPFONT ( 191 , 46  );
         Size = MAP_APPFONT ( 57 , 12 ) ;
         Border = TRUE ;
@@ -364,6 +379,7 @@ TabPage RID_SVXPAGE_LINE
     };
     CheckBox CB_SYMBOL_RATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 130 , 62  );
         Size = MAP_APPFONT ( 118 , 10 ) ;
@@ -394,6 +410,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_TYPE_1
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 32  ) ;
         Size = MAP_APPFONT ( 43 , 49 ) ;
@@ -407,6 +424,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_TYPE_2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 32  ) ;
         Size = MAP_APPFONT ( 43 , 49 ) ;
@@ -426,6 +444,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     NumericField NUM_FLD_1
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 48  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -440,6 +459,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     NumericField NUM_FLD_2
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 48  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -460,6 +480,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_LENGTH_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 64  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -480,6 +501,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_LENGTH_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 64  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -506,6 +528,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 79  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -524,6 +547,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     CheckBox CBX_SYNCHRONIZE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE";
         Pos = MAP_APPFONT ( 12 , 95  ) ;
         Size = MAP_APPFONT ( 174 , 10 ) ;
         Text [ en-US ] = "~Fit to line width" ;
@@ -540,6 +564,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_LINESTYLES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 14  ) ;
         Size = MAP_APPFONT ( 120 , 80 ) ;
@@ -549,6 +574,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD";
         Pos = MAP_APPFONT ( 198 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -556,6 +582,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY";
         Pos = MAP_APPFONT ( 198 , 34  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -563,6 +590,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE";
         Pos = MAP_APPFONT ( 198 , 54  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -570,6 +598,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD";
         Pos = MAP_APPFONT ( 198 , 74  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -585,6 +614,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE";
         Pos = MAP_APPFONT ( 198 , 96  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -638,6 +668,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 14  ) ;
         Size = MAP_APPFONT ( 87 , 12 ) ;
@@ -651,6 +682,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ListBox LB_LINEENDS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 30  ) ;
         Size = MAP_APPFONT ( 87 , 80 ) ;
@@ -660,6 +692,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD";
         Pos = MAP_APPFONT ( 198 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -667,6 +700,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY";
         Pos = MAP_APPFONT ( 198 , 34  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -674,6 +708,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE";
         Pos = MAP_APPFONT ( 198 , 54  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -681,6 +716,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD";
         Pos = MAP_APPFONT ( 198 , 74  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -696,6 +732,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE";
         Pos = MAP_APPFONT ( 198 , 96  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 3bd0467f2f0c..6a92d21d3ad4 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     MetricBox ED_TABPOS
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 39 , 165 ) ;
         Minimum = -5600 ;
@@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_LEFT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT";
         Pos = MAP_APPFONT ( 66 , 14 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -78,6 +80,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_RIGHT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT";
         Pos = MAP_APPFONT ( 66 , 28 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Righ~t" ;
@@ -89,6 +92,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER";
         Pos = MAP_APPFONT ( 66 , 42 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "C~entered" ;
@@ -100,6 +104,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_DECIMAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL";
         Pos = MAP_APPFONT ( 66 , 56 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Deci~mal" ;
@@ -117,6 +122,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     Edit ED_TABTYPE_DECCHAR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 156 , 68 ) ;
         Size = MAP_APPFONT ( 9 , 12 ) ;
@@ -130,6 +136,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_FILLCHAR_NO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO";
         Pos = MAP_APPFONT ( 66 , 97 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "N~one" ;
@@ -137,30 +144,35 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_FILLCHAR_POINTS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS";
         Pos = MAP_APPFONT ( 66 , 111 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~........" ;
     };
     RadioButton BTN_FILLCHAR_DASHLINE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE";
         Pos = MAP_APPFONT ( 66 , 125 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~--------" ;
     };
     RadioButton BTN_FILLCHAR_UNDERSCORE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE";
         Pos = MAP_APPFONT ( 66 , 139 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~_____" ;
     };
     RadioButton BTN_FILLCHAR_OTHER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER";
         Pos = MAP_APPFONT ( 66 , 153 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Character" ;
     };
     Edit ED_FILLCHAR_OTHER
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 156 , 151 ) ;
         Size = MAP_APPFONT ( 9 , 12 ) ;
@@ -168,18 +180,21 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW";
         Pos = MAP_APPFONT ( 204 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~New" ;
     };
     PushButton BTN_DELALL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL";
         Pos = MAP_APPFONT ( 204 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Delete ~All" ;
     };
     PushButton BTN_DEL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL";
         Pos = MAP_APPFONT ( 204 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index 3f2bed8b5a52..3ccd6987943f 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -71,6 +71,7 @@
  // RID_SVXPAGE_TEXTANIMATION ---------------------------------------------
 TabPage RID_SVXPAGE_TEXTANIMATION
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_TEXTANIMATION";
     SVLook = TRUE ;
     Hide = TRUE ;
     Size = MAP_APPFONT ( MA_TOTAL_WIDTH , 185 ) ;
@@ -91,6 +92,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ListBox LB_EFFECT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MA_EFFECTLIST_X, MA_CURR_Y + 1 ) ;
         Size = MAP_APPFONT ( MA_EFFECTLIST_WIDTH , 57 ) ;
@@ -117,6 +119,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_UP
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP );
         Size = BUTTON_SIZE ;
@@ -125,6 +128,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 3*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT);
         Size = BUTTON_SIZE ;
@@ -133,6 +137,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_RIGHT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT ) ;
         Size = BUTTON_SIZE ;
@@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_DOWN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 2*MA_BUTTON_HEIGHT ) ;
         Size = BUTTON_SIZE ;
@@ -157,6 +163,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y2      RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_START_INSIDE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y2 ) ;
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
@@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y3      MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     TriStateBox TSB_STOP_INSIDE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y3 ) ;
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
@@ -181,6 +189,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y5      MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_ENDLESS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y5 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -188,6 +197,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     NumericField NUM_FLD_COUNT
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y5 ) ;
@@ -209,6 +219,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y7      MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_PIXEL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y7 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -216,6 +227,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     MetricField MTR_FLD_AMOUNT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y7 ) ;
@@ -242,6 +254,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y9      MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_AUTO
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO";
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -249,6 +262,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     MetricField MTR_FLD_DELAY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y9 ) ;
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index 59b0a534472d..c4ae4b5062ce 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -53,6 +54,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 28  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -60,6 +62,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_FIT_TO_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 42  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -67,6 +70,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_CONTOUR
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 56  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -74,6 +78,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_WORDWRAP_TEXT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT";
         TabStop = TRUE;
         Pos = MAP_APPFONT( 132, 14  ) ;
         Size = MAP_APPFONT( 127 , 10 ) ;
@@ -81,6 +86,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE";
         TabStop = TRUE;
         Pos = MAP_APPFONT( 132, 28  );
         Size = MAP_APPFONT( 127 , 10 );
@@ -118,6 +124,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 83  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -134,6 +141,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 99  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -150,6 +158,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 115  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -166,6 +175,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 131  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -202,6 +212,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_FULL_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 132 , 139  ) ;
         Size = MAP_APPFONT ( 116 , 10 ) ;
diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src
index 761fdcfb2349..c753402f0440 100644
--- a/cui/source/tabpages/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -61,6 +61,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_POS_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 8  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_POS_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 8  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -127,6 +129,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 61  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -142,6 +145,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 61  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -172,6 +176,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     CheckBox CBX_SCALE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE";
         Pos = MAP_APPFONT ( 12 , 47 + 61 ) ;
         Size = MAP_APPFONT ( 162 , 10 ) ;
         TabStop = TRUE ;
@@ -189,6 +194,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
 
     TriStateBox TSB_POSPROTECT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT";
         Pos = MAP_APPFONT ( 12 , 10 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Position" ;
@@ -197,6 +203,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
 
     TriStateBox TSB_SIZEPROTECT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT";
         Pos = MAP_APPFONT ( 12 , 24 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "~Size" ;
@@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH";
         Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "~Fit width to text" ;
@@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT";
         Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Fit ~height to text" ;
@@ -251,6 +260,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     ListBox LB_ANCHOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR";
         Pos = MAP_APPFONT ( 46 + 121 + 16 , 8 + 120 ) ;
         Size = MAP_APPFONT ( 54 , 60 ) ;
         Hide = TRUE ;
@@ -272,6 +282,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     ListBox LB_ORIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT";
         Pos = MAP_APPFONT ( 46 + 121 + 16 , 22 + 120 );
         Size = MAP_APPFONT ( 54 , 60 ) ;
         Hide = TRUE ;
@@ -319,6 +330,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_POS_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 11  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -334,6 +346,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_POS_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 11 ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -376,6 +389,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 82 + 22  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -427,6 +441,7 @@ TabPage RID_SVXPAGE_SLANT
     };
     MetricField MTR_FLD_RADIUS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -454,6 +469,7 @@ TabPage RID_SVXPAGE_SLANT
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 46  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index ddce17eebb23..258d6404f19a 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -127,6 +127,7 @@ hidspecial HID_HANGULDLG_EDIT_NEWWORD       { HelpID =  HID_HANGULDLG_EDIT_NEWWO
 hidspecial HID_HANGULDLG_SUGGESTIONS { HelpId = HID_HANGULDLG_SUGGESTIONS; };
 hidspecial HID_HANGULDLG_SUGGESTIONS_GRID { HelpId = HID_HANGULDLG_SUGGESTIONS_GRID; };
 hidspecial HID_HANGULDLG_SUGGESTIONS_LIST { HelpId = HID_HANGULDLG_SUGGESTIONS_LIST; };
+hidspecial HID_HYPERLINK_DIALOG             { HelpID = HID_HYPERLINK_DIALOG ;};
 hidspecial HID_HYPERDLG_DOC_PATH            { HelpID = HID_HYPERDLG_DOC_PATH ;};
 hidspecial HID_HYPERDLG_INET_PATH           { HelpID = HID_HYPERDLG_INET_PATH ;};
 hidspecial HID_HYPERDLG_MAIL_PATH           { HelpID = HID_HYPERDLG_MAIL_PATH ;};
@@ -199,4 +200,5 @@ hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICA
 hidspecial UID_OFA_CONNPOOL_DRIVERLIST_BACK         { HelpId = UID_OFA_CONNPOOL_DRIVERLIST_BACK; };
 hidspecial UID_SEARCH_RECORDSTATUS          { HelpID = UID_SEARCH_RECORDSTATUS ;};
 hidspecial HID_MACRO_HEADERTABLISTBOX       { HelpID = HID_MACRO_HEADERTABLISTBOX ;};
+hidspecial HID_DLG_PASSWORD_TO_OPEN_MODIFY  { HelpID = HID_DLG_PASSWORD_TO_OPEN_MODIFY ;};