sb131: merged in re/DEV300_next towards DEV300_m94

167 files changed, 1655 insertions, 2241 deletions

diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index a248ac8aff..ae6e4720b2 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -27,19 +27,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#include <hintids.hxx>
-#ifndef _CMDID_H
-#include <cmdid.h>		  	// Funktion-Ids
-#endif
-
-#include <com/sun/star/i18n/ScriptType.hpp>
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
 
-#ifndef _MSGBOX_HXX //autogen
+#include <com/sun/star/i18n/ScriptType.hpp>
+
+#include <hintids.hxx>
+#include <cmdid.h>		  	// Funktion-Ids
 #include <vcl/msgbox.hxx>
-#endif
 #include <svl/eitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
@@ -47,9 +43,7 @@
 #include <svx/htmlmode.hxx>
 #include <sfx2/bindings.hxx>
 #include <editeng/brshitem.hxx>
-#ifndef _SVX_TSTPITEM_HXX //autogen
 #include <editeng/tstpitem.hxx>
-#endif
 #include <svx/optgrid.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
@@ -59,37 +53,25 @@
 #include <optcomp.hxx>
 #include <edtwin.hxx>
 #include <swmodule.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
+#include <doc.hxx>
 #include <wrtsh.hxx>
-#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED
 #include <IDocumentDeviceAccess.hxx>
-#endif
 #include <uitool.hxx>
 #include <initui.hxx>					// fuer ::GetGlossaries()
 #include <fldbas.hxx>	   //fuer UpdateFields
-#ifndef _WVIEW_HXX
 #include <wview.hxx>
-#endif
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
-#ifndef _PVIEW_HXX
 #include <pview.hxx>
-#endif
 #include <usrpref.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
 #include <glosdoc.hxx>
 #include <uiitems.hxx>
 #include <editeng/langitem.hxx>
 #include <unotools/lingucfg.hxx>
 #include <editeng/unolingu.hxx>
-
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
 #include <globals.h>		// globale Konstanten z.B.
 #include <svl/slstitm.hxx>
 #include "swabstdlg.hxx"
@@ -334,8 +316,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     /*---------------------------------------------------------------------
             Seite Dokumentansicht auswerten
     -----------------------------------------------------------------------*/
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                FN_PARAM_DOCDISP, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, FALSE, &pItem ))
     {
         const SwDocDisplayItem* pDocDispItem = (const SwDocDisplayItem*)pItem;
 
@@ -364,23 +345,20 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
                 Elemente - Item auswerten
     -----------------------------------------------------------------------*/
 
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                                    FN_PARAM_ELEM, FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ELEM, FALSE, &pItem ) )
     {
         const SwElemItem* pElemItem = (const SwElemItem*)pItem;
         pElemItem->FillViewOptions( aViewOpt );
 
     }
 
-    if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_METRIC,
-                                                    FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_METRIC, FALSE, &pItem ) )
     {
         SFX_APP()->SetOptions(rSet);
         const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem;
         ::SetDfltMetric((FieldUnit)pMetricItem->GetValue(), !bTextDialog);
     }
-    if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC,
-                                                    FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC, FALSE, &pItem ) )
     {
         const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem;
         FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue();
@@ -389,8 +367,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
             pAppView->ChangeTabMetric(eUnit);
     }
 
-    if( SFX_ITEM_SET == rSet.GetItemState(FN_VSCROLL_METRIC,
-                                                    FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState(FN_VSCROLL_METRIC, FALSE, &pItem ) )
     {
         const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem;
         FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue();
@@ -399,8 +376,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
             pAppView->ChangeVLinealMetric(eUnit);
     }
 
-    if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP,
-                                                    FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, FALSE, &pItem ) )
     {
         USHORT nTabDist = ((const SfxUInt16Item*)pItem)->GetValue();
         pPref->SetDefTab(nTabDist);
@@ -427,8 +403,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
             Seite Rastereinstellungen auswerten
     ----------------------------------------------------------------------*/
 
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                                SID_ATTR_GRID_OPTIONS, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS, FALSE, &pItem ))
     {
         const SvxGridItem* pGridItem = (const SvxGridItem*)pItem;
 
@@ -458,8 +433,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     //	 	Writer Drucker Zusatzeinstellungen auswerten
     //----------------------------------------------------------------------------
 
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                                FN_PARAM_ADDPRINTER, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, FALSE, &pItem ))
     {
         SwPrintOptions* pOpt = GetPrtOptions(!bTextDialog);
         if (pOpt)
@@ -473,16 +447,25 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
 
     }
 
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                        FN_PARAM_SHADOWCURSOR, FALSE, &pItem ))
+    if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, FALSE, &pItem ))
     {
         ((SwShadowCursorItem*)pItem)->FillViewOptions( aViewOpt );
         if(pBindings)
             pBindings->Invalidate(FN_SHADOWCURSOR);
     }
 
-    if( SFX_ITEM_SET == rSet.GetItemState(
-                        FN_PARAM_CRSR_IN_PROTECTED, FALSE, &pItem ))
+    if( pAppView )
+    {
+        SwWrtShell &rWrtSh = pAppView->GetWrtShell();
+        const bool bAlignFormulas = rWrtSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+        pPref->SetAlignMathObjectsToBaseline( bAlignFormulas );
+        
+        // don't align formulas in documents that are currently loading
+        if (bAlignFormulas && !rWrtSh.GetDoc()->IsInReading())
+            rWrtSh.AlignAllFormulasToBaseline();
+    }
+
+    if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, FALSE, &pItem ))
     {
         aViewOpt.SetCursorInProtectedArea(((const SfxBoolItem*)pItem)->GetValue());
     }
@@ -510,8 +493,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
             }
 #endif
         // dann an der akt. View und Shell die entsp. Elemente setzen
-    ApplyUsrPref( aViewOpt, pAppView,
-                 bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB);
+    ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB);
 }
 /* -----------------12.02.99 12:28-------------------
  *
@@ -609,6 +591,15 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
                 if ( fnCreatePage )
                     pRet = (*fnCreatePage)( pParent, rSet );
             }
+            if (pRet && (nId == RID_SW_TP_OPTSHDWCRSR || nId == RID_SW_TP_HTML_OPTSHDWCRSR))
+            {
+                SwView* pCurrView = GetView();
+                if(pCurrView)
+                {
+                    aSet.Put( SwWrtShellItem( SID_WRT_SHELL, pCurrView->GetWrtShellPtr() ) );
+                    pRet->PageCreated(aSet);
+                }
+            }
         }
         break;
 #ifdef DBG_UTIL
@@ -653,5 +644,3 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemS
     return pRet;
 }
 
-
-
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index a5a8bad22c..a397788b23 100755..100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -65,7 +65,7 @@
 #include <fmtfld.hxx>
 #include <node.hxx>
 #include <swwait.hxx>
-#include <swprtopt.hxx>
+#include <printdata.hxx>
 #include <frmatr.hxx>
 #include <view.hxx> 		// fuer die aktuelle Sicht
 #include <edtwin.hxx>
@@ -895,7 +895,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
     pDev->SetLineColor();
     pDev->SetBackground();
     BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, this);
-    SwPrtOptions aOpts( aEmptyStr );
+    SwPrintData aOpts;
     ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect );
     pDev->Pop();
 
@@ -1147,6 +1147,23 @@ void SwDocShell::GetState(SfxItemSet& rSet)
             rSet.Put( SvxFontListItem( pFontList, SID_ATTR_CHAR_FONTLIST ) );
         }
         break;
+        case SID_MAIL_PREPAREEXPORT:
+        {
+            //check if linked content or possibly hidden content is available
+            //pDoc->UpdateFlds( NULL, false );
+            sfx2::LinkManager& rLnkMgr = pDoc->GetLinkManager();
+            const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
+            sal_Bool bRet = sal_False;
+            if( rLnks.Count() )
+                bRet = sal_True;
+            else
+            {
+                //sections with hidden flag, hidden character attribute, hidden paragraph/text or conditional text fields
+                bRet = pDoc->HasInvisibleContent(); 
+            }
+            rSet.Put( SfxBoolItem( nWhich, bRet ) );
+        }
+        break;
 
         default: DBG_ASSERT(!this,"Hier darfst Du nicht hinein!");
 
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index b0ae69370f..3f1884987f 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -324,7 +324,7 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
     }    
 #endif
     return nRet;
-}
+} 
 
 /*--------------------------------------------------------------------
     Beschreibung:	Organizer
@@ -1209,7 +1209,19 @@ void SwDocShell::Execute(SfxRequest& rReq)
             }
             break;
 
-        case SID_MAIL_EXPORT_FINISHED:
+        case SID_MAIL_PREPAREEXPORT:
+        {
+            //pWrtShell is not set in page preview
+            if(pWrtShell)
+                pWrtShell->StartAllAction();
+            pDoc->UpdateFlds( NULL, false );
+            pDoc->EmbedAllLinks();
+            pDoc->RemoveInvisibleContent();
+            if(pWrtShell)
+                pWrtShell->EndAllAction();
+        }
+        break;
+          case SID_MAIL_EXPORT_FINISHED:
         {
                 if(pWrtShell)
                     pWrtShell->StartAllAction();
@@ -1240,7 +1252,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                 if ( !aFileName.Len() )
                 {
                     FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE, 0 );
-                    //set HelpIds
+
                     const sal_Int16 nControlIds[] = {
                         CommonFilePickerElementIds::PUSHBUTTON_OK,
                         CommonFilePickerElementIds::PUSHBUTTON_CANCEL,
@@ -1251,17 +1263,33 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         ExtendedFilePickerElementIds::LISTBOX_TEMPLATE,
                         0
                     };
-                    sal_Int32 nHelpIds[8];
-                    sal_Int32 nStartHelpId =
-                        bCreateHtml ?
-                            HID_SEND_HTML_CTRL_PUSHBUTTON_OK : HID_SEND_MASTER_CTRL_PUSHBUTTON_OK ;
-                    for(int nHelp = 0; nHelp < 7; nHelp++)
-                        nHelpIds[nHelp] = nStartHelpId++;
-                    nHelpIds[7] = 0;
 
-                    aDlgHelper.SetControlHelpIds( nControlIds, nHelpIds );
-//                    aDlgHelper.SetDialogHelpId( bCreateHtml ? HID_SEND_HTML_DIALOG : HID_SEND_MASTER_DIALOG );
+                    const char* aHTMLHelpIds[] = 
+                    {                       
+                         HID_SEND_HTML_CTRL_PUSHBUTTON_OK,
+                         HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL,
+                         HID_SEND_HTML_CTRL_LISTBOX_FILTER,
+                         HID_SEND_HTML_CTRL_CONTROL_FILEVIEW,
+                         HID_SEND_HTML_CTRL_EDIT_FILEURL,
+                         HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION,
+                         HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE,
+                         ""
+                    };
+
+                    const char* aMasterHelpIds[] = 
+                    {                       
+                         HID_SEND_MASTER_CTRL_PUSHBUTTON_OK,
+                         HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL,
+                         HID_SEND_MASTER_CTRL_LISTBOX_FILTER,
+                         HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW,
+                         HID_SEND_MASTER_CTRL_EDIT_FILEURL,
+                         HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION,
+                         HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE,
+                         ""
+                    };
 
+                    const char** pHelpIds = bCreateHtml ? aHTMLHelpIds : aMasterHelpIds;
+                    aDlgHelper.SetControlHelpIds( nControlIds, pHelpIds );
                     uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
 
                     const SfxFilter* pFlt;
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 4b0e3575a6..f9ee757b23 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -336,6 +336,12 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
                 pColl->SetFmtAttr( aFontHeight );
             }
         }
+
+        // the default for documents created via 'File/New' should be 'on'
+        // (old documents, where this property was not yet implemented, will get the
+        // value 'false' in the SwDoc c-tor)
+        pDoc->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, 
+                SW_MOD()->GetUsrPref( bWeb )->IsAlignMathObjectsToBaseline() );
     }
 
     /* #106748# If the default frame direction of a document is RTL
@@ -823,4 +829,3 @@ void SwDocShell::SubInitNew()
 IDocumentDeviceAccess* SwDocShell::getIDocumentDeviceAccess() { return pDoc; }
 const IDocumentSettingAccess* SwDocShell::getIDocumentSettingAccess() const { return pDoc; }
 IDocumentChartDataProviderAccess* SwDocShell::getIDocumentChartDataProviderAccess() { return pDoc; }
-
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index aeb8fca52d..423ec4777c 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -28,6 +28,7 @@
 
 
 #include "swmn.hrc"
+#include "helpid.h"
 
 /*------------------------------------------------------------------------
  Beschreibung: Menu Window
@@ -37,7 +38,7 @@
         MenuItem\
         {\
             Identifier = FN_INSERT_CAPTION ;\
-            HelpID = FN_INSERT_CAPTION ;\
+            HelpId = CMD_FN_INSERT_CAPTION ;\
             Text [ en-US ] = "~Caption..." ;\
     };
 
@@ -45,31 +46,30 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_TABLE_DLG ; \
-        HelpID = FN_FORMAT_TABLE_DLG ; \
+        HelpId = CMD_FN_FORMAT_TABLE_DLG ; \
         Text [ en-US ] = "~Table..." ; \
     };\
     MenuItem\
     {\
         Identifier = FN_TABLE_MERGE_TABLE ; \
-        HelpID = FN_TABLE_MERGE_TABLE ; \
+        HelpId = CMD_FN_TABLE_MERGE_TABLE ; \
         Text [ en-US ] = "Merge Tables";\
     };\
     MenuItem\
     {\
         Identifier = FN_TABLE_SPLIT_TABLE ; \
-        HelpID = FN_TABLE_SPLIT_TABLE ; \
+        HelpId = CMD_FN_TABLE_SPLIT_TABLE ; \
         Text [ en-US ] = "~Split Table" ; \
     };\
     MenuItem\
     {\
         Identifier = FN_NUM_FORMAT_TABLE_DLG ; \
-        HelpID = FN_NUM_FORMAT_TABLE_DLG ; \
+        HelpId = CMD_FN_NUM_FORMAT_TABLE_DLG ; \
         Text [ en-US ] = "N~umber Format..." ; \
     };\
     MenuItem\
     {\
         Identifier = MN_CELL ; \
-        HelpID = MN_CELL ; \
         Command = ".uno:CellMenu" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Ze~lle : Zelle */\
         Text [ en-US ] = "~Cell" ; \
@@ -81,46 +81,46 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_MERGE_CELLS ; \
-                    HelpID = FN_TABLE_MERGE_CELLS ; \
+                    HelpId = CMD_FN_TABLE_MERGE_CELLS ; \
                     Text [ en-US ] = "~Merge" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SPLIT_CELLS ; \
-                    HelpID = FN_TABLE_SPLIT_CELLS ; \
+                    HelpId = CMD_FN_TABLE_SPLIT_CELLS ; \
                     Text [ en-US ] = "~Split..." ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_NONE ; \
-                    HelpID = FN_TABLE_VERT_NONE ; \
+                    HelpId = CMD_FN_TABLE_VERT_NONE ; \
                     Text [ en-US ] = "~Top" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_CENTER ; \
-                    HelpID = FN_TABLE_VERT_CENTER ; \
+                    HelpId = CMD_FN_TABLE_VERT_CENTER ; \
                     Text [ en-US ] = "C~enter" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_BOTTOM ; \
-                    HelpID = FN_TABLE_VERT_BOTTOM ; \
+                    HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \
                     Text [ en-US ] = "~Bottom" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_READ_ONLY_CELLS ; \
-                    HelpID = FN_TABLE_SET_READ_ONLY_CELLS ; \
+                    HelpId = CMD_FN_TABLE_SET_READ_ONLY_CELLS ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Schützen : ~Sch³tzen */\
                     Text [ en-US ] = "~Protect" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_UNSET_READ_ONLY_CELLS ; \
-                    HelpID = FN_TABLE_UNSET_READ_ONLY_CELLS ; \
+                    HelpId = CMD_FN_TABLE_UNSET_READ_ONLY_CELLS ; \
                     Text [ en-US ] = "~Unprotect" ; \
                 };\
             };\
@@ -143,27 +143,27 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_ROW_HEIGHT ; \
-                    HelpID = FN_TABLE_SET_ROW_HEIGHT ; \
+                    HelpId = CMD_FN_TABLE_SET_ROW_HEIGHT ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Höhe... : ~H÷he... */\
                     Text [ en-US ] = "~Height..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_ROW_SPLIT;\
-                    HelpID = FN_TABLE_ROW_SPLIT ; \
+                    HelpId = CMD_FN_TABLE_ROW_SPLIT ; \
                     Text [ en-US ] = "Allow Row to Break A~cross Pages and Columns" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_OPTIMAL_HEIGHT ; \
-                    HelpID = FN_TABLE_OPTIMAL_HEIGHT ; \
+                    HelpId = CMD_FN_TABLE_OPTIMAL_HEIGHT ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Optimale Höhe : ~Optimale H÷he */\
                     Text [ en-US ] = "~Optimal Height" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_BALANCE_ROWS ; \
-                    HelpID = FN_TABLE_BALANCE_ROWS ; \
+                    HelpId = CMD_FN_TABLE_BALANCE_ROWS ; \
                     /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
@@ -171,7 +171,7 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SELECT_ROW ; \
-                    HelpID = FN_TABLE_SELECT_ROW ; \
+                    HelpId = CMD_FN_TABLE_SELECT_ROW ; \
                     /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\
                     /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\
                     Text [ en-US ] = "~Select" ; \
@@ -179,14 +179,14 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_ROW_DLG ; \
-                    HelpID = FN_TABLE_INSERT_ROW_DLG ; \
+                    HelpId = CMD_FN_TABLE_INSERT_ROW_DLG ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_ROW ; \
-                    HelpID = FN_TABLE_DELETE_ROW ; \
+                    HelpId = CMD_FN_TABLE_DELETE_ROW ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\
                     Text [ en-US ] = "~Delete" ; \
                 };\
@@ -207,19 +207,19 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_COL_WIDTH ; \
-                    HelpID = FN_TABLE_SET_COL_WIDTH ; \
+                    HelpId = CMD_FN_TABLE_SET_COL_WIDTH ; \
                     Text [ en-US ] = "~Width..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_ADJUST_CELLS ; \
-                    HelpID = FN_TABLE_ADJUST_CELLS ; \
+                    HelpId = CMD_FN_TABLE_ADJUST_CELLS ; \
                     Text [ en-US ] = "~Optimal Width " ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_BALANCE_CELLS ; \
-                    HelpID = FN_TABLE_BALANCE_CELLS ; \
+                    HelpId = CMD_FN_TABLE_BALANCE_CELLS ; \
                     /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
@@ -227,7 +227,7 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SELECT_COL ; \
-                    HelpID = FN_TABLE_SELECT_COL ; \
+                    HelpId = CMD_FN_TABLE_SELECT_COL ; \
                     /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\
                     /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\
                     Text [ en-US ] = "~Select" ; \
@@ -235,14 +235,14 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_COL_DLG ; \
-                    HelpID = FN_TABLE_INSERT_COL_DLG ; \
+                    HelpId = CMD_FN_TABLE_INSERT_COL_DLG ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_COL ; \
-                    HelpID = FN_TABLE_DELETE_COL ; \
+                    HelpId = CMD_FN_TABLE_DELETE_COL ; \
                     /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\
                     Text [ en-US ] = "~Delete" ; \
                 };\
@@ -264,7 +264,7 @@
     MenuItem\
     {\
         Identifier = FN_DRAWTEXT_ATTR_DLG ; \
-        HelpID = FN_DRAWTEXT_ATTR_DLG ; \
+        HelpId = CMD_FN_DRAWTEXT_ATTR_DLG ; \
         Text [ en-US ] = "Te~xt..." ; \
     };
 
@@ -272,7 +272,7 @@
     MenuItem\
     {\
         Identifier = FN_NAME_SHAPE ; \
-        HelpID = FN_NAME_SHAPE ; \
+        HelpId = CMD_FN_NAME_SHAPE ; \
         Text [ en-US ] = "Name..." ; \
     };
 
@@ -281,7 +281,7 @@
     MenuItem\
     {\
         Identifier = FN_TITLE_DESCRIPTION_SHAPE; \
-        HelpID = FN_TITLE_DESCRIPTION_SHAPE; \
+        HelpId = CMD_FN_TITLE_DESCRIPTION_SHAPE; \
         Text [ en-US ] = "Description..." ; \
     };
 
@@ -289,7 +289,7 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_FRAME_DLG ; \
-        HelpID = FN_FORMAT_FRAME_DLG ; \
+        HelpId = CMD_FN_FORMAT_FRAME_DLG ; \
         Text [ en-US ] = "~Frame..." ; \
     };
 
@@ -344,13 +344,13 @@
     MenuItem\
     {\
         Identifier = FN_FRAME_UP ; \
-        HelpID = FN_FRAME_UP ; \
+        HelpId = CMD_FN_FRAME_UP ; \
         Text [ en-US ] = "Bring ~Forward" ; \
     };\
     MenuItem\
     {\
         Identifier = FN_FRAME_DOWN ; \
-        HelpID = FN_FRAME_DOWN ; \
+        HelpId = CMD_FN_FRAME_DOWN ; \
         Text [ en-US ] = "Send Back~ward" ; \
     };
 
@@ -430,45 +430,45 @@
     MenuItem\
     {\
         Identifier = FN_REPLY ;\
-        HelpID = FN_DELETE_NOTE ;\
+        HelpID = CMD_FN_REPLY ;\
         Text [ en-US ] = "Reply" ;\
     };\
     SEPARATOR ; \
     MenuItem\
     {\
-        Identifier = FN_DELETE_NOTE ;\
-        HelpID = FN_DELETE_NOTE ;\
+        Identifier = FN_DELETE_COMMENT ;\
+        HelpID = CMD_FN_DELETE_COMMENT ;\
         Text [ en-US ] = "Delete ~Comment" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_DELETE_NOTE_AUTHOR ;\
-        HelpID = FN_DELETE_NOTE_AUTHOR ;\
+        HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;\
         Text [ en-US ] = "Delete ~All Comments by $1" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_DELETE_ALL_NOTES ;\
-        HelpID = FN_DELETE_ALL_NOTES ;\
+        HelpId = CMD_FN_DELETE_ALL_NOTES ;\
         Text [ en-US ] = "~Delete All Comments" ;\
     };\
     /*
     MenuItem\
     {\
         Identifier = FN_HIDE_NOTE ;\
-        HelpID = FN_HIDE_NOTE ;\
+        HelpId = CMD_FN_HIDE_NOTE ;\
         Text [ en-US ] = "~Hide comment" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_HIDE_NOTE_AUTHOR	 ;\
-        HelpID = FN_HIDE_NOTE_AUTHOR ;\
+        HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;\
         Text [ en-US ] = "Hide ~author" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_HIDE_ALL_NOTES ;\
-        HelpID = FN_HIDE_ALL_NOTES ;\
+        HelpId = CMD_FN_HIDE_ALL_NOTES ;\
         Text [ en-US ] = "Hide all ~comments" ;\
     };
     */
@@ -513,13 +513,13 @@ Menu MN_TAB_POPUPMENU
         MenuItem
         {
             Identifier = FN_VIEW_TABLEGRID ;
-            HelpID = FN_VIEW_TABLEGRID ;
+            HelpId = CMD_FN_VIEW_TABLEGRID ;
             Text [ en-US ] = "Table Boundaries" ;
         };
         MenuItem
         {
             Identifier = FN_SET_MODOPT_TBLNUMFMT ;
-            HelpID = FN_SET_MODOPT_TBLNUMFMT ;
+            HelpId = CMD_FN_SET_MODOPT_TBLNUMFMT ;
             Text [ en-US ] = "~Number Recognition";
         };
         SEPARATOR ;
@@ -531,7 +531,7 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_FRAME_WRAP_CONTOUR ; \
-        HelpID = FN_FRAME_WRAP_CONTOUR ; \
+        HelpId = CMD_FN_FRAME_WRAP_CONTOUR ; \
         Text [ en-US ] = "~Contour" ; \
     };
 
@@ -539,7 +539,7 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = SID_CONTOUR_DLG ; \
-        HelpID = SID_CONTOUR_DLG ; \
+        HelpId = CMD_SID_CONTOUR_DLG ; \
         Text [ en-US ] = "~Edit Contour..." ; \
     };
 
@@ -550,7 +550,6 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_WRAP ; \
-        HelpID = MN_WRAP ; \
         Command = ".uno:WrapMenu" ; \
         Text [ en-US ] = "~Wrap" ; \
         SubMenu = Menu\
@@ -561,35 +560,35 @@ Menu MN_TAB_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_NOWRAP ; \
-                    HelpID = FN_FRAME_NOWRAP ; \
+                    HelpId = CMD_FN_FRAME_NOWRAP ; \
                     Text [ en-US ] = "~No Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP ; \
-                    HelpID = FN_FRAME_WRAP ; \
+                    HelpId = CMD_FN_FRAME_WRAP ; \
                     Text [ en-US ] = "~Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpID = FN_FRAME_WRAP_IDEAL ; \
+                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
                     Text [ en-US ] = "~Optimal Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpID = FN_FRAME_WRAPTHRU ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
                     Text [ en-US ] = "~Wrap Through" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
                     Text [ en-US ] = "In ~Background" ; \
                 };\
                 SEPARATOR ; \
@@ -599,7 +598,7 @@ Menu MN_TAB_POPUPMENU
                 {\
                     Checkable = TRUE ; \
                     Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpID = FN_WRAP_ANCHOR_ONLY ; \
+                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
                     Text [ en-US ] = "~First Paragraph" ; \
                     };\
             };\
@@ -617,7 +616,6 @@ String MN_DRAW_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_WRAP ; \
-        HelpID = MN_WRAP ; \
         Command = ".uno:WrapMenu" ; \
         SubMenu = Menu\
         {\
@@ -627,35 +625,35 @@ String MN_DRAW_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_NOWRAP ; \
-                    HelpID = FN_FRAME_NOWRAP ; \
+                    HelpId = CMD_FN_FRAME_NOWRAP ; \
                     Text [ en-US ] = "~No Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP ; \
-                    HelpID = FN_FRAME_WRAP ; \
+                    HelpId = CMD_FN_FRAME_WRAP ; \
                     Text [ en-US ] = "~Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpID = FN_FRAME_WRAP_IDEAL ; \
+                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
                     Text [ en-US ] = "~Optimal Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpID = FN_FRAME_WRAPTHRU ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
                     Text [ en-US ] = "~Wrap Through" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
                     Text [ en-US ] = "In ~Background" ; \
                 };\
                 SEPARATOR ; \
@@ -664,14 +662,14 @@ String MN_DRAW_POPUPMENU
                 {\
                     Checkable = TRUE ; \
                     Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpID = FN_WRAP_ANCHOR_ONLY ; \
+                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
                     Text [ en-US ] = "~First Paragraph" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_DRAW_WRAP_DLG ; \
-                    HelpID = FN_DRAW_WRAP_DLG ; \
+                    HelpId = CMD_FN_DRAW_WRAP_DLG ; \
                     Text [ en-US ] = "~Edit..." ; \
                 };\
             };\
@@ -690,7 +688,7 @@ String MN_DRAW_POPUPMENU
     {\
         RadioCheck = TRUE ; \
         Identifier = FN_TOOL_ANKER_FRAME ; \
-        HelpID = FN_TOOL_ANKER_FRAME ; \
+        HelpId = CMD_FN_TOOL_ANKER_FRAME ; \
         Text [ en-US ] = "To ~Frame" ; \
     };
 
@@ -698,7 +696,7 @@ String MN_DRAW_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_TOOL_ANKER ; \
-        HelpID = FN_TOOL_ANKER ; \
+        HelpId = CMD_FN_TOOL_ANKER ; \
         Command = ".uno:AnchorMenu" ; \
         Text [ en-US ] = "An~chor" ; \
         SubMenu = Menu\
@@ -709,28 +707,28 @@ String MN_DRAW_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_PAGE ; \
-                    HelpID = FN_TOOL_ANKER_PAGE ; \
+                    HelpId = CMD_FN_TOOL_ANKER_PAGE ; \
                     Text [ en-US ] = "To P~age" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_PARAGRAPH ; \
-                    HelpID = FN_TOOL_ANKER_PARAGRAPH ; \
+                    HelpId = CMD_FN_TOOL_ANKER_PARAGRAPH ; \
                     Text [ en-US ] = "To ~Paragraph" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_AT_CHAR ; \
-                    HelpID = FN_TOOL_ANKER_AT_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANKER_AT_CHAR ; \
                     Text [ en-US ] = "To ~Character" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_CHAR ; \
-                    HelpID = FN_TOOL_ANKER_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANKER_CHAR ; \
                     Text [ en-US ] = "As C~haracter" ; \
                 };\
                 MN_AT_FRAME\
@@ -820,7 +818,7 @@ Menu MN_DRWTXT_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_DELETE_COMMENT ;\
-        HelpID = FN_DELETE_COMMENT ;\
+        HelpId = CMD_FN_DELETE_COMMENT ;\
         Text [ en-US ] = "Delete ~Changes Note" ;\
     };\
 
@@ -905,7 +903,6 @@ String MN_GRF_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_FORMAT_FRM_HORZ ; \
-        HelpID = MN_FORMAT_FRM_HORZ ; \
         Command = ".uno:AlignFrameMenu" ; \
         SubMenu = Menu\
         {\
@@ -914,38 +911,38 @@ String MN_GRF_POPUPMENU
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_LEFT ; \
                     Text [ en-US ] = "~Left" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_CENTER ; \
                     Text [ en-US ] = "~Centered" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_RIGHT ; \
                     Text [ en-US ] = "~Right" ; \
                     };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_TOP ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_TOP ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_TOP ; \
                     Text [ en-US ] = "Base at ~Top" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_CENTER ; \
                     Text [ en-US ] = "Base in ~Middle" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_BOTTOM ; \
                     Text [ en-US ] = "Base at ~Bottom" ; \
                     };\
             };\
@@ -968,13 +965,13 @@ Menu MN_GRF_POPUPMENU
         MenuItem
         {
             Identifier = FN_FORMAT_GRAFIC_DLG ;
-            HelpID = FN_FORMAT_GRAFIC_DLG ;
+            HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
             Text [ en-US ] = "~Picture..." ;
         };
         MenuItem
         {
             Identifier = FN_SAVE_GRAPHIC;
-            HelpID = FN_SAVE_GRAPHIC;
+            HelpId = CMD_FN_SAVE_GRAPHIC;
             Text [ en-US ] = "Save Graphics..." ;
         };
         MN_FRM_CAPTION_ITEM
@@ -1005,7 +1002,7 @@ Menu MN_OLE_POPUPMENU
         MenuItem
         {
             Identifier = FN_FORMAT_FRAME_DLG ;
-            HelpID = FN_FORMAT_FRAME_DLG ;
+            HelpId = CMD_FN_FORMAT_FRAME_DLG ;
             Text [ en-US ] = "Object..." ;
         };
         MN_FRM_CAPTION_ITEM
@@ -1047,13 +1044,13 @@ Menu MN_PPREVIEW_POPUPMENU
         MenuItem
         {
             Identifier = FN_PAGEUP ;
-            HelpID = FN_PAGEUP ;
+            HelpId = CMD_FN_PAGEUP ;
             Text [ en-US ] = "Previous Page" ;
         };
         MenuItem
         {
             Identifier = FN_PAGEDOWN ;
-            HelpID = FN_PAGEDOWN ;
+            HelpId = CMD_FN_PAGEDOWN ;
             /* ### ACHTUNG: Neuer Text in Resource? Nächste Seite : Nõchste Seite */
             Text [ en-US ] = "Next Page" ;
         };
@@ -1066,14 +1063,14 @@ Menu MN_PPREVIEW_POPUPMENU
         MenuItem
         {
             Identifier = FN_PRINT_PAGEPREVIEW ;
-            HelpID = FN_PRINT_PAGEPREVIEW ;
+            HelpId = CMD_FN_PRINT_PAGEPREVIEW ;
             Text [ en-US ] = "Print" ;
         };
         SEPARATOR ;
         MenuItem
         {
             Identifier = SID_PRINTPREVIEW;
-            HelpID =  SID_PRINTPREVIEW;
+            HelpId = CMD_SID_PRINTPREVIEW;
             Text [ en-US ] = "Close Preview" ;
         };
     };
diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src
index 0d8baf2b2b..41dcaa9852 100644
--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -45,6 +45,7 @@ TabPage TP_CONDCOLL
     };
     CheckBox CB_CONDITION
     {
+        HelpID = "sw:CheckBox:TP_CONDCOLL:CB_CONDITION";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -84,6 +85,7 @@ TabPage TP_CONDCOLL
     };
     ListBox LB_STYLE
     {
+        HelpID = "sw:ListBox:TP_CONDCOLL:LB_STYLE";
         Pos = MAP_APPFONT ( 188 , 39 ) ;
         Size = MAP_APPFONT ( 60 , 108 ) ;
         TabStop = TRUE ;
@@ -94,6 +96,7 @@ TabPage TP_CONDCOLL
     };
     ListBox LB_FILTER
     {
+        HelpID = "sw:ListBox:TP_CONDCOLL:LB_FILTER";
         Pos = MAP_APPFONT ( 188 , 150 ) ;
         Size = MAP_APPFONT ( 60 , 50 ) ;
         DropDown = TRUE ;
@@ -104,6 +107,7 @@ TabPage TP_CONDCOLL
     };
     PushButton PB_REMOVE
     {
+        HelpID = "sw:PushButton:TP_CONDCOLL:PB_REMOVE";
         Pos = MAP_APPFONT ( 129 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         TabStop = TRUE ;
@@ -112,6 +116,7 @@ TabPage TP_CONDCOLL
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "sw:PushButton:TP_CONDCOLL:PB_ASSIGN";
         Pos = MAP_APPFONT ( 185 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index e6a6a82729..ba39ec72a8 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -120,6 +120,7 @@ TabPage TP_CHAR_URL
     };
     Edit ED_URL
     {
+        HelpID = "sw:Edit:TP_CHAR_URL:ED_URL";
         Pos = MAP_APPFONT ( 88 , 15 ) ;
         Size = MAP_APPFONT ( 104 , 12 ) ;
         Border = TRUE ;
@@ -127,6 +128,7 @@ TabPage TP_CHAR_URL
     };
     PushButton PB_URL
     {
+        HelpID = "sw:PushButton:TP_CHAR_URL:PB_URL";
         Pos = MAP_APPFONT ( 198 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -140,6 +142,7 @@ TabPage TP_CHAR_URL
     };
     Edit ED_TEXT
     {
+        HelpID = "sw:Edit:TP_CHAR_URL:ED_TEXT";
         Pos = MAP_APPFONT ( 88 , 31 ) ;
         Size = MAP_APPFONT ( 104 , 12 ) ;
         Border = TRUE ;
@@ -154,6 +157,7 @@ TabPage TP_CHAR_URL
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_CHAR_URL:ED_NAME";
         Pos = MAP_APPFONT ( 88 , 47 ) ;
         Size = MAP_APPFONT ( 104 , 12 ) ;
         Border = TRUE ;
@@ -168,6 +172,7 @@ TabPage TP_CHAR_URL
     };
     ComboBox LB_TARGET
     {
+        HelpID = "sw:ComboBox:TP_CHAR_URL:LB_TARGET";
         Pos = MAP_APPFONT ( 88 , 63 ) ;
         Size = MAP_APPFONT ( 104 , 60 ) ;
         TabStop = TRUE ;
@@ -177,6 +182,7 @@ TabPage TP_CHAR_URL
     };
     PushButton PB_EVENT
     {
+        HelpID = "sw:PushButton:TP_CHAR_URL:PB_EVENT";
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -196,6 +202,7 @@ TabPage TP_CHAR_URL
     };
     ListBox LB_VISITED
     {
+        HelpID = "sw:ListBox:TP_CHAR_URL:LB_VISITED";
         Pos = MAP_APPFONT ( 88 , 113 ) ;
         Size = MAP_APPFONT ( 104 , 60 ) ;
         Border = TRUE ;
@@ -212,6 +219,7 @@ TabPage TP_CHAR_URL
     };
     ListBox LB_NOT_VISITED
     {
+        HelpID = "sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED";
         Pos = MAP_APPFONT ( 88 , 129 ) ;
         Size = MAP_APPFONT ( 104 , 60 ) ;
         Border = TRUE ;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index d05fe5976e..f69fcc577f 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -364,10 +364,10 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
 
     Font		aOldFont = mpPrinter->GetFont();
     USHORT		nScript;
-    USHORT		nIdx = 0;
+    size_t		nIdx = 0;
     xub_StrLen	nStart = 0;
     xub_StrLen	nEnd;
-    USHORT		nCnt = maScriptChg.Count();
+    size_t		nCnt = maScriptChg.size();
 
     if( nCnt )
     {
@@ -406,10 +406,10 @@ void SwDropCapsPict::CheckScript( void )
         return;
 
     maScriptText = maText;
-    USHORT nCnt = maScriptChg.Count();
+    size_t nCnt = maScriptChg.size();
     if( nCnt )
     {
-        maScriptChg.Remove( 0, nCnt );
+        maScriptChg.clear();
         maScriptType.Remove( 0, nCnt );
         maTextWidth.Remove( 0, nCnt );
         nCnt = 0;
@@ -436,7 +436,7 @@ void SwDropCapsPict::CheckScript( void )
         do
         {
             nChg = (xub_StrLen)xBreak->endOfScript( maText, nChg, nScript );
-            maScriptChg.Insert( nChg, nCnt );
+            maScriptChg.push_back( nChg );
             maScriptType.Insert( nScript, nCnt );
             maTextWidth.Insert( ULONG(0), nCnt++ );
 
@@ -453,10 +453,10 @@ Size SwDropCapsPict::CalcTextSize( void )
     InitPrinter();
 
     USHORT		nScript;
-    USHORT		nIdx = 0;
+    size_t		nIdx = 0;
     xub_StrLen	nStart = 0;
     xub_StrLen	nEnd;
-    USHORT		nCnt = maScriptChg.Count();
+    size_t		nCnt = maScriptChg.size();
     if( nCnt )
     {
         nEnd = maScriptChg[ nIdx ];
diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src
index ae3da330c4..edf373fcd3 100644
--- a/sw/source/ui/chrdlg/drpcps.src
+++ b/sw/source/ui/chrdlg/drpcps.src
@@ -59,12 +59,14 @@ TabPage TP_DROPCAPS
     Hide = TRUE ;
     CheckBox CB_SWITCH
     {
+        HelpID = "sw:CheckBox:TP_DROPCAPS:CB_SWITCH";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Display drop caps" ;
     };
     CheckBox CB_WORD
     {
+        HelpID = "sw:CheckBox:TP_DROPCAPS:CB_WORD";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "~Whole word" ;
@@ -77,6 +79,7 @@ TabPage TP_DROPCAPS
     };
     NumericField FLD_DROPCAPS
     {
+        HelpID = "sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS";
         Border = TRUE ;
         First = 1 ;
         Last = 9 ;
@@ -98,6 +101,7 @@ TabPage TP_DROPCAPS
     };
     NumericField FLD_LINES
     {
+        HelpID = "sw:NumericField:TP_DROPCAPS:FLD_LINES";
         Border = TRUE ;
         First = 2 ;
         Last = 9 ;
@@ -119,6 +123,7 @@ TabPage TP_DROPCAPS
     };
     MetricField FLD_DISTANCE
     {
+        HelpID = "sw:MetricField:TP_DROPCAPS:FLD_DISTANCE";
         Border = TRUE ;
         DecimalDigits = 2 ;
         First = 0 ;
@@ -155,6 +160,7 @@ TabPage TP_DROPCAPS
     };
     Edit EDT_TEXT
     {
+        HelpID = "sw:Edit:TP_DROPCAPS:EDT_TEXT";
         Border = TRUE ;
         Left = TRUE ;
         Pos = MAP_APPFONT ( 143 , 100 ) ;
@@ -171,6 +177,7 @@ TabPage TP_DROPCAPS
     };
     ListBox BOX_TEMPLATE
     {
+        HelpID = "sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE";
         Border = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 143 , 116 ) ;
diff --git a/sw/source/ui/chrdlg/makefile.mk b/sw/source/ui/chrdlg/makefile.mk
index 42aad1aedd..6b05d0fbfb 100644
--- a/sw/source/ui/chrdlg/makefile.mk
+++ b/sw/source/ui/chrdlg/makefile.mk
@@ -30,6 +30,9 @@ PRJ=..$/..$/..
 PRJNAME=sw
 TARGET=chrdlg
 LIBTARGET=NO
+
+ENABLE_EXCEPTIONS=TRUE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  $(PRJ)$/inc$/swpre.mk
diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src
index 14ed11fa0a..591333766b 100644
--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -51,6 +51,7 @@ TabPage TP_NUMPARA
     };
     ListBox LB_OUTLINE_LEVEL
     {
+        HelpID = "sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL";
         Pos = MAP_APPFONT ( 130 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 65 ) ;
         DropDown = TRUE ;
@@ -98,6 +99,7 @@ TabPage TP_NUMPARA
     };
     ListBox LB_NUMBER_STYLE
     {
+        HelpID = "sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE";
         Pos = MAP_APPFONT ( 130 , 41 ) ;
         Size = MAP_APPFONT ( 118 , 65 ) ;
         DropDown = TRUE ;
@@ -109,6 +111,7 @@ TabPage TP_NUMPARA
     };
     TriStateBox CB_NEW_START
     {
+        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NEW_START";
         Pos = MAP_APPFONT ( 12 , 58 ) ;
         Size = MAP_APPFONT ( 160 , 10 ) ;
         Hide = TRUE ;
@@ -117,6 +120,7 @@ TabPage TP_NUMPARA
     };
     TriStateBox CB_NUMBER_NEW_START
     {
+        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START";
         Pos = MAP_APPFONT ( 21 , 73 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         Hide = TRUE ;
@@ -125,6 +129,7 @@ TabPage TP_NUMPARA
     };
     NumericField NF_NEW_START
     {
+        HelpID = "sw:NumericField:TP_NUMPARA:NF_NEW_START";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 72 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -148,6 +153,7 @@ TabPage TP_NUMPARA
     };
     TriStateBox CB_COUNT_PARA
     {
+        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA";
         Pos = MAP_APPFONT ( 12 , 100 ) ;
         Size = MAP_APPFONT ( 160 , 10 ) ;
         TabStop = TRUE ;
@@ -155,6 +161,7 @@ TabPage TP_NUMPARA
     };
     TriStateBox CB_RESTART_PARACOUNT
     {
+        HelpID = "sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT";
         Pos = MAP_APPFONT ( 12 , 116 ) ;
         Size = MAP_APPFONT ( 160 , 10 ) ;
         TabStop = TRUE ;
@@ -169,6 +176,7 @@ TabPage TP_NUMPARA
     };
     NumericField NF_RESTART_PARA
     {
+        HelpID = "sw:NumericField:TP_NUMPARA:NF_RESTART_PARA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 130 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src
index c626278748..1ed8491a31 100644
--- a/sw/source/ui/chrdlg/swbreak.src
+++ b/sw/source/ui/chrdlg/swbreak.src
@@ -32,7 +32,7 @@
  // #define DLG_BREAK 256
 ModalDialog DLG_BREAK
 {
-    HelpID = FN_INSERT_BREAK_DLG ;
+    HelpID = CMD_FN_INSERT_BREAK_DLG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 161 , 114 ) ;
@@ -63,6 +63,7 @@ ModalDialog DLG_BREAK
     };
     RadioButton RB_LINE
     {
+        HelpID = "sw:RadioButton:DLG_BREAK:RB_LINE";
         Pos = MAP_APPFONT ( 12 , 15 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "~Line break" ;
@@ -71,6 +72,7 @@ ModalDialog DLG_BREAK
     };
     RadioButton RB_PAGE
     {
+        HelpID = "sw:RadioButton:DLG_BREAK:RB_PAGE";
         Pos = MAP_APPFONT ( 12 , 39 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
         Text [ en-US ] = "~Page break" ;
@@ -79,6 +81,7 @@ ModalDialog DLG_BREAK
     };
     RadioButton RB_COL
     {
+        HelpID = "sw:RadioButton:DLG_BREAK:RB_COL";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         Text [ en-US ] = "~Column break" ;
@@ -100,6 +103,7 @@ ModalDialog DLG_BREAK
     };
     ListBox LB_COLL
     {
+        HelpID = "sw:ListBox:DLG_BREAK:LB_COLL";
         Pos = MAP_APPFONT ( 12 , 62 ) ;
         Size = MAP_APPFONT ( 75 , 50 ) ;
         TabStop = TRUE ;
@@ -112,6 +116,7 @@ ModalDialog DLG_BREAK
     };
     CheckBox CB_PAGENUM
     {
+        HelpID = "sw:CheckBox:DLG_BREAK:CB_PAGENUM";
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 84 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Seitennummer ~ändern : Seitennummer ~õndern */
@@ -120,6 +125,7 @@ ModalDialog DLG_BREAK
     };
     NumericField ED_PAGENUM
     {
+        HelpID = "sw:NumericField:DLG_BREAK:ED_PAGENUM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 94 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 7fb20bf3f8..f5e8c1e4ef 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -109,7 +109,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
     aStyleLB.SetSelectHdl(		LINK(this, SwCondCollPage, SelectHdl));
     aFilterLB.SetSelectHdl(		LINK(this, SwCondCollPage, SelectHdl));
 
-    aTbLinks.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
+    aTbLinks.SetStyle(aTbLinks.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
     aTbLinks.SetSelectionMode( SINGLE_SELECTION );
     aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT );
     aTbLinks.Resize();	// OS: Hack fuer richtige Selektion
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 352819a184..6fa2666579 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -458,4 +458,3 @@ int SwTestItem::operator==( const SfxPoolItem& rAttr ) const
 #endif
 
 
-
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index e8752bd08f..c48a8b64fe 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -330,7 +330,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
 
     m_aStatusLB.SetHelpId(HID_MM_TESTACCOUNTSETTINGS_TLB);
     static long nTabs[] = {2, 0, aSz.Width()/2 };
-    m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+    m_aStatusLB.SetStyle( m_aStatusLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
     m_aStatusLB.SetTabs(&nTabs[0], MAP_PIXEL);
     short nEntryHeight = m_aStatusLB.GetEntryHeight();
diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src
index f76f01ccab..1673f1952e 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -53,6 +53,7 @@ TabPage TP_MAILCONFIG
     };
     Edit  ED_DISPLAYNAME
     {
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME";
         Pos = MAP_APPFONT ( 88 , 14 ) ;
         Size = MAP_APPFONT ( 160 , 12 ) ;
         Border = TRUE;
@@ -65,12 +66,14 @@ TabPage TP_MAILCONFIG
     };
     Edit   ED_ADDRESS
     {
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS";
         Pos = MAP_APPFONT ( 88 , 29 ) ;
         Size = MAP_APPFONT ( 160 , 12 ) ;
         Border = TRUE;
     };
     CheckBox        CB_REPLYTO
     {
+        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO";
         Pos = MAP_APPFONT ( 12 , 45 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text[ en-US ] = "Send replies to ~different e-mail address";
@@ -83,6 +86,7 @@ TabPage TP_MAILCONFIG
     };
     Edit ED_REPLYTO
     {
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO";
         Pos = MAP_APPFONT ( 88 , 58 ) ;
         Size = MAP_APPFONT ( 160 , 12 ) ;
         Border = TRUE;
@@ -101,6 +105,7 @@ TabPage TP_MAILCONFIG
     };
     Edit ED_SERVER
     {
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER";
         Pos = MAP_APPFONT ( 88 , 87 ) ;
         Size = MAP_APPFONT ( 105 , 12 ) ;
         Border = TRUE;
@@ -114,6 +119,7 @@ TabPage TP_MAILCONFIG
     };
     NumericField    NF_PORT
     {
+        HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT";
         Pos = MAP_APPFONT ( 223 , 87 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE;
@@ -127,12 +133,14 @@ TabPage TP_MAILCONFIG
     };
     CheckBox        CB_SECURE
     {
+        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE";
         Pos = MAP_APPFONT ( 12 , 104 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text[ en-US ] = "~Use secure connection (SSL)";
     };
     PushButton PB_AUTHENTICATION
     {
+        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION";
         Pos = MAP_APPFONT ( 88 , 118 ) ;
         Size = MAP_APPFONT ( 105 , 14 ) ;
         Text[ en-US ] = "Server Au~thentication";
@@ -144,6 +152,7 @@ TabPage TP_MAILCONFIG
     };
     PushButton      PB_TEST
     {
+        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST";
         Pos = MAP_APPFONT ( 88 , 164 ) ;
         Size = MAP_APPFONT ( 105 , 14 ) ;
         Text[ en-US ] = "Test S~ettings...";
@@ -179,6 +188,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
     };
     MultiLineEdit       ED_ERROR
     {
+        HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR";
         Pos = MAP_APPFONT ( 6 , 79 ) ;
         Size = MAP_APPFONT ( 238 , 60 ) ;
         Border = TRUE;
@@ -191,6 +201,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
     };
     PushButton          PB_STOP
     {
+        HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP";
         Pos = MAP_APPFONT ( 85 , 156 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~Stop";
@@ -268,12 +279,14 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
 
     CheckBox        CB_AUTHENTICATION
     {
+        HelpID = "sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION";
         Pos = MAP_APPFONT ( 6 , 3 ) ;
         Size = MAP_APPFONT ( 238 , 10 ) ;
         Text[ en-US ] = "The outgoing mail server (SMTP) requires au~thentication";
     };
     RadioButton RB_SEP_AUTHENTICATION
     {
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION";
         Pos = MAP_APPFONT ( 12 , 17 ) ;
         Size = MAP_APPFONT ( 232 , 10 ) ;
         Text[ en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication";
@@ -292,6 +305,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     Edit  ED_USERNAME
     {
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME";
         Pos = MAP_APPFONT ( 78 , 42 ) ;
         Size = MAP_APPFONT ( 115 , 12 ) ;
         Border = TRUE;
@@ -304,6 +318,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     Edit  ED_OUTPASSWORD
     {
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD";
         Pos = MAP_APPFONT ( 78 , 57 ) ;
         Size = MAP_APPFONT ( 115 , 12 ) ;
         Border = TRUE;
@@ -311,6 +326,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     RadioButton RB_SMPTAFTERPOP
     {
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP";
         Pos = MAP_APPFONT ( 12 , 73 ) ;
         Size = MAP_APPFONT ( 232 , 20 ) ;
         WordBreak = TRUE;
@@ -330,6 +346,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     Edit  ED_SERVER
     {
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER";
         Pos = MAP_APPFONT ( 78 , 108 ) ;
         Size = MAP_APPFONT ( 115 , 12 ) ;
         Border = TRUE;
@@ -343,6 +360,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     NumericField NF_PORT
     {
+        HelpID = "sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT";
         Pos = MAP_APPFONT ( 219 , 108 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE;
@@ -362,12 +380,14 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     RadioButton RB_POP3
     {
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3";
         Pos = MAP_APPFONT ( 78 , 125 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text[ en-US ] = "~POP 3";
     };
     RadioButton RB_IMAP
     {
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP";
         Pos = MAP_APPFONT ( 78 , 138 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text[ en-US ] = "~IMAP";
@@ -380,6 +400,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     Edit ED_INUSERNAME
     {
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME";
         Pos = MAP_APPFONT ( 78 , 150 ) ;
         Size = MAP_APPFONT ( 115 , 12 ) ;
         Border = TRUE;
@@ -392,6 +413,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     Edit ED_INPASSWORD
     {
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD";
         Pos = MAP_APPFONT ( 78 , 165 ) ; 
         Size = MAP_APPFONT ( 115 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/config/makefile.mk b/sw/source/ui/config/makefile.mk
index 4b8ed01ca9..c093b18ce0 100644
--- a/sw/source/ui/config/makefile.mk
+++ b/sw/source/ui/config/makefile.mk
@@ -83,5 +83,4 @@ LIB1OBJFILES = \
 
 # --- Targets -------------------------------------------------------
 
-.INCLUDE :  target.mk
-
+.INCLUDE :  target.mk
\ No newline at end of file
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 53603031e1..0dbd938359 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -152,7 +152,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe
             pEntry->SetUserData( (void*)(ULONG)nResId );
         }
     }
-    m_aOptionsLB.SetWindowBits( m_aOptionsLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
+    m_aOptionsLB.SetStyle( m_aOptionsLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
     m_aOptionsLB.SetHighlightRange();
 
     FreeResource();
diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src
index 3682b49477..fee89d732d 100644
--- a/sw/source/ui/config/optcomp.src
+++ b/sw/source/ui/config/optcomp.src
@@ -50,6 +50,7 @@ TabPage TP_OPTCOMPATIBILITY_PAGE
     };
     ListBox LB_FORMATTING
     {
+        HelpID = "sw:ListBox:TP_OPTCOMPATIBILITY_PAGE:LB_FORMATTING";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 118 , 24 ) ;
         DropDown = TRUE;
@@ -70,12 +71,14 @@ TabPage TP_OPTCOMPATIBILITY_PAGE
     };
     PushButton PB_RESET
     {
+        HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET";
         Pos = MAP_APPFONT ( 125 , 165 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Reset";
     };
     PushButton PB_DEFAULT
     {
+        HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT";
         Pos = MAP_APPFONT ( 188 , 165 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Use as ~Default";
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 31f2e7041f..d58d1b6ac4 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -30,7 +30,7 @@
 #define FL_NOPRINT              2
 #define FL_WINDOW               3
 
-#define CB_GRF         		1
+#define CB_GRF         		    1
 #define CB_TBL                  2
 #define CB_DRWFAST              3
 #define CB_FIELD                4
@@ -39,10 +39,10 @@
 #define CB_SPACE                7
 #define CB_HSPACE               8
 #define CB_SHYPH                9
-#define CB_FLD_HIDDEN               10
+#define CB_FLD_HIDDEN           10
 #define CB_BREAK                11
 #define CB_ANY_RULER            12
-#define CB_CROSS		14
+#define CB_CROSS		        14
 #define CB_HSCROLL              15
 #define CB_VSCROLL              16
 #define CB_HRULER               17
@@ -50,7 +50,7 @@
 #define FL_LINE                 22
 #define CB_POSTIT               23
 #define CB_VRULER_RIGHT         24
-#define CB_BIGHANDLE                  25
+#define CB_BIGHANDLE            25
 
 #define FL_SETTINGS             26
 #define LB_METRIC               27
@@ -191,7 +191,7 @@
 #define FL_TABLE_SEPARATOR          139
 #define CB_PROSPECT_RTL        140
 
-#define FL_SHDWCRSFLAG                             1
+#define FL_SHDWCRSFLAG                 1
 #define CB_SHDWCRSONOFF                2
 #define FL_SHDWCRSMODE                 3
 #define FT_SHDWCRSFILLMODE			   4
@@ -201,5 +201,8 @@
 #define RB_SHDWCRSFILLSPACE            8
 #define CB_ALLOW_IN_PROT			  12
 #define FL_CRSR_OPT                   13
-#define FL_SEPARATOR_SHDW               14
+#define FL_SEPARATOR_SHDW             14
+#define FL_LAYOUT_OPTIONS             15
+#define CB_MATH_BASELINE_ALIGNMENT	  16
+
 
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index a2573ed3c1..bd7133612a 100755..100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -56,18 +56,21 @@ TabPage TP_CONTENT_OPT
     };
     CheckBox CB_CROSS
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_CROSS";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Guides ~while moving";
     };
     CheckBox CB_HANDLE
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Sim~ple handles";
     };
     CheckBox CB_BIGHANDLE
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Large handles";
@@ -81,54 +84,63 @@ TabPage TP_CONTENT_OPT
     };
     CheckBox CB_HSCROLL
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL";
         Pos = MAP_APPFONT ( 136 , 14 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "H~orizontal scrollbar" ;
     };
     CheckBox CB_VSCROLL
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL";
         Pos = MAP_APPFONT ( 136 , 27 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Vertical scrollbar" ;
     };
     CheckBox CB_ANY_RULER
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER";
         Pos = MAP_APPFONT ( 136 , 40 ) ;
         Size = MAP_APPFONT ( 65 , 10 ) ;
         Text [ en-US ] = "R~uler" ;
     };
     CheckBox CB_HRULER
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HRULER";
         Pos = MAP_APPFONT ( 142 , 53 ) ;
         Size = MAP_APPFONT ( 62 , 10 ) ;
         Text [ en-US ] = "Hori~zontal ruler" ;
     };
     ListBox LB_HMETRIC
     {
+        HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC";
         Pos = MAP_APPFONT ( 206 , 51 ) ;
         Size = MAP_APPFONT ( 45 , 60 ) ;
         DropDown = TRUE;
     };
     CheckBox CB_VRULER
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VRULER";
         Pos = MAP_APPFONT ( 142 , 66 ) ;
         Size = MAP_APPFONT ( 62 , 10 ) ;
         Text [ en-US ] = "Verti~cal ruler" ;
     };
     CheckBox CB_VRULER_RIGHT
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT";
         Pos = MAP_APPFONT ( 148 , 79 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "Right-aligned";
     };
     ListBox LB_VMETRIC
     {
+        HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC";
         Pos = MAP_APPFONT ( 206 , 64 ) ;
         Size = MAP_APPFONT ( 45 , 60 ) ;
         DropDown = TRUE;
     };
     CheckBox CB_SMOOTH_SCROLL
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL";
         Pos = MAP_APPFONT ( 136 , 79 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "S~mooth scroll" ;
@@ -142,6 +154,7 @@ TabPage TP_CONTENT_OPT
     };
     CheckBox CB_GRF
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_GRF";
         Pos = MAP_APPFONT ( 12 , 67 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Graphics and objects" ;
@@ -150,24 +163,28 @@ TabPage TP_CONTENT_OPT
     };
     CheckBox CB_TBL
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_TBL";
         Pos = MAP_APPFONT ( 12 , 80 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Tables " ;
     };
     CheckBox CB_DRWFAST
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST";
         Pos = MAP_APPFONT ( 12 , 93 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Dra~wings and controls" ;
     };
     CheckBox CB_FIELD
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_FIELD";
         Pos = MAP_APPFONT ( 12 , 106 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Field codes" ;
     };
     CheckBox CB_POSTIT
     {
+        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT";
         Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Comments" ;
@@ -188,6 +205,7 @@ TabPage TP_CONTENT_OPT
     };
     ListBox LB_METRIC
     {
+        HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_METRIC";
         Pos = MAP_APPFONT ( 199, 133 ) ;
         Size = MAP_APPFONT ( 50 , 50 ) ;
         Border = TRUE ;
@@ -214,6 +232,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     CheckBox CB_PGRF /*functionally merged with CB_PDRAW*/
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Pictures and objects" ;
@@ -224,6 +243,7 @@ TabPage TP_OPTPRINT_PAGE
     removed, tables now always get printed
     CheckBox CB_PTAB
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Tables" ;
@@ -233,6 +253,7 @@ TabPage TP_OPTPRINT_PAGE
     functionally merged with CB_PGRF (pictures and graphics)
     CheckBox CB_PDRAW
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Dra~wings" ;
@@ -240,30 +261,35 @@ TabPage TP_OPTPRINT_PAGE
 */
     CheckBox CB_CTRLFLD
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Form control~s" ;
     };
     CheckBox CB_BACKGROUND
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Page ba~ckground" ;
     };
     CheckBox CB_BLACK_FONT
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Print text in blac~k" ;
     };
     CheckBox CB_HIDDEN_TEXT
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT";
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Hidden te~xt" ;
     };
     CheckBox CB_TEXT_PLACEHOLDER
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER";
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Text ~placeholder" ;
@@ -283,6 +309,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     CheckBox CB_LEFTP
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP";
         Pos = MAP_APPFONT ( 96 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Left pages" ;
@@ -291,6 +318,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     CheckBox CB_RIGHTP
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP";
         Pos = MAP_APPFONT ( 96 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Right pages" ;
@@ -299,6 +327,7 @@ TabPage TP_OPTPRINT_PAGE
     removed, noe handled by the new print dialog (i.e. vcl) itself
     CheckBox CB_REVERSE
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE";
         Pos = MAP_APPFONT ( 96 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Re~versed" ;
@@ -306,12 +335,14 @@ TabPage TP_OPTPRINT_PAGE
 */
     CheckBox CB_PROSPECT
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT";
         Pos = MAP_APPFONT ( 96 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Broch~ure" ;
     };
     CheckBox CB_PROSPECT_RTL
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL";
         Pos = MAP_APPFONT ( 103 , 53 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Right to Left" ;
@@ -319,6 +350,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     RadioButton RB_NO
     {
+        HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO";
         Pos = MAP_APPFONT ( 180 , 14 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "~None" ;
@@ -327,18 +359,21 @@ TabPage TP_OPTPRINT_PAGE
     };
     RadioButton RB_ONLY
     {
+        HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY";
         Pos = MAP_APPFONT ( 180 , 27 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "Comments ~only" ;
     };
     RadioButton RB_END
     {
+        HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_END";
         Pos = MAP_APPFONT ( 180 , 40 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "End of docu~ment" ;
     };
     RadioButton RB_PAGEEND
     {
+        HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND";
         Pos = MAP_APPFONT ( 180 , 53 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "~End of page" ;
@@ -365,6 +400,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     CheckBox CB_PRINTEMPTYPAGES
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES";
         Pos = MAP_APPFONT ( 12 , 106 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
@@ -373,6 +409,7 @@ TabPage TP_OPTPRINT_PAGE
 /*
     CheckBox CB_SINGLEJOBS
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS";
         Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
@@ -381,6 +418,7 @@ TabPage TP_OPTPRINT_PAGE
 */
     CheckBox CB_PAPERFROMSETUP
     {
+        HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP";
         Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
@@ -395,6 +433,7 @@ TabPage TP_OPTPRINT_PAGE
     };
     ListBox LB_FAX
     {
+        HelpID = "sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 132 ) ;
         Size = MAP_APPFONT ( 184 , 70 ) ;
@@ -437,6 +476,7 @@ TabPage TP_STD_FONT
     };
     MetricBox LB_STANDARD_SIZE
     {
+        HelpID = "sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE";
         Pos = MAP_APPFONT ( 204 , 25 ) ;
         Size = MAP_APPFONT ( 30 , 60 ) ;
         Border = TRUE ;
@@ -444,6 +484,7 @@ TabPage TP_STD_FONT
     };
     MetricBox LB_TITLE_SIZE
     {
+        HelpID = "sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE";
         Pos = MAP_APPFONT ( 204 , 42 ) ;
         Size = MAP_APPFONT ( 30 , 60 ) ;
         Border = TRUE ;
@@ -451,6 +492,7 @@ TabPage TP_STD_FONT
     };
     MetricBox LB_LIST_SIZE
     {
+        HelpID = "sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE";
         Pos = MAP_APPFONT ( 204 , 59 ) ;
         Size = MAP_APPFONT ( 30 , 60 ) ;
         Border = TRUE ;
@@ -458,6 +500,7 @@ TabPage TP_STD_FONT
     };
     MetricBox LB_LABEL_SIZE
     {
+        HelpID = "sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE";
         Pos = MAP_APPFONT ( 204 , 76 ) ;
         Size = MAP_APPFONT ( 30 , 60 ) ;
         Border = TRUE ;
@@ -465,6 +508,7 @@ TabPage TP_STD_FONT
     };
     MetricBox LB_INDEX_SIZE
     {
+        HelpID = "sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE";
         Pos = MAP_APPFONT ( 204 , 93 ) ;
         Size = MAP_APPFONT ( 30 , 60 ) ;
         Border = TRUE ;
@@ -507,6 +551,7 @@ TabPage TP_STD_FONT
     };
     ComboBox LB_STANDARD
     {
+        HelpID = "sw:ComboBox:TP_STD_FONT:LB_STANDARD";
         Pos = MAP_APPFONT ( 63 , 25 ) ;
         Size = MAP_APPFONT ( 135 , 73 ) ;
         TabStop = TRUE ;
@@ -515,6 +560,7 @@ TabPage TP_STD_FONT
     };
     ComboBox LB_TITLE
     {
+        HelpID = "sw:ComboBox:TP_STD_FONT:LB_TITLE";
         Pos = MAP_APPFONT ( 63 , 42 ) ;
         Size = MAP_APPFONT ( 135, 73 ) ;
         TabStop = TRUE ;
@@ -523,6 +569,7 @@ TabPage TP_STD_FONT
     };
     ComboBox LB_LIST
     {
+        HelpID = "sw:ComboBox:TP_STD_FONT:LB_LIST";
         Pos = MAP_APPFONT ( 63 , 59 ) ;
         Size = MAP_APPFONT ( 135 , 73 ) ;
         TabStop = TRUE ;
@@ -531,6 +578,7 @@ TabPage TP_STD_FONT
     };
     ComboBox LB_LABEL
     {
+        HelpID = "sw:ComboBox:TP_STD_FONT:LB_LABEL";
         Pos = MAP_APPFONT ( 63 , 76 ) ;
         Size = MAP_APPFONT ( 135 , 73 ) ;
         TabStop = TRUE ;
@@ -539,6 +587,7 @@ TabPage TP_STD_FONT
     };
     ComboBox LB_IDX
     {
+        HelpID = "sw:ComboBox:TP_STD_FONT:LB_IDX";
         Pos = MAP_APPFONT ( 63 , 94 ) ;
         Size = MAP_APPFONT ( 135, 73 ) ;
         TabStop = TRUE ;
@@ -547,12 +596,14 @@ TabPage TP_STD_FONT
     };
     CheckBox CB_DOCONLY
     {
+        HelpID = "sw:CheckBox:TP_STD_FONT:CB_DOCONLY";
         Pos = MAP_APPFONT ( 12 , 111 ) ;
         Size = MAP_APPFONT ( 147 , 10 ) ;
         Text [ en-US ] = "C~urrent document only" ;
     };
     PushButton PB_STANDARD
     {
+        HelpID = "sw:PushButton:TP_STD_FONT:PB_STANDARD";
         Pos = MAP_APPFONT ( 204 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Default" ;
@@ -588,6 +639,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_HEADER
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 107 , 10 ) ;
         TabStop = TRUE ;
@@ -595,6 +647,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_REPEAT_HEADER
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER";
         Pos = MAP_APPFONT ( 21 , 27 ) ;
         Size = MAP_APPFONT ( 99 , 10 ) ;
         TabStop = TRUE ;
@@ -602,6 +655,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_DONT_SPLIT
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 107 , 10 ) ;
         TabStop = TRUE ;
@@ -609,6 +663,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_BORDER
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 107 , 10 ) ;
         TabStop = TRUE ;
@@ -628,6 +683,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_NUMFORMATTING
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING";
         Pos = MAP_APPFONT ( 131 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         TabStop = TRUE ;
@@ -635,6 +691,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_NUMFMT_FORMATTING
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING";
         Pos = MAP_APPFONT ( 140 , 27 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         TabStop = TRUE ;
@@ -642,6 +699,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     CheckBox CB_NUMALIGNMENT
     {
+        HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT";
         Pos = MAP_APPFONT ( 140 , 40 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         TabStop = TRUE ;
@@ -667,6 +725,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     MetricField MF_ROWMOVE
     {
+        HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 83 , 91 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -689,6 +748,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     MetricField MF_COLMOVE
     {
+        HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 83 , 106 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -717,6 +777,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     MetricField MF_ROWINSERT
     {
+        HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 91 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -739,6 +800,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     MetricField MF_COLINSERT
     {
+        HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 106 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -761,6 +823,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     RadioButton RB_FIX
     {
+        HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX";
         Pos = MAP_APPFONT ( 21 , 133 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Fixed" ;
@@ -774,6 +837,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     RadioButton RB_FIXPROP
     {
+        HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP";
         Pos = MAP_APPFONT ( 21 , 151 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Fi~xed, proportional" ;
@@ -787,6 +851,7 @@ TabPage TP_OPTTABLE_PAGE
     };
     RadioButton RB_VAR
     {
+        HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR";
         Pos = MAP_APPFONT ( 21 , 169 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Variable" ;
@@ -820,6 +885,7 @@ TabPage TP_OPTSHDWCRSR
     };
     CheckBox CB_PARA
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Pa~ragraph end" ;
@@ -828,48 +894,56 @@ TabPage TP_OPTSHDWCRSR
     };
     CheckBox CB_SHYPH
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Custom h~yphens" ;
     };
     CheckBox CB_SPACE
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Spac~es" ;
     };
     CheckBox CB_HSPACE
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_HSPACE";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Non-breaking s~paces" ;
     };
     CheckBox CB_TAB
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_TAB";
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Ta~bs" ;
     };
     CheckBox CB_BREAK
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK";
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Brea~ks" ;
     };
     CheckBox CB_CHAR_HIDDEN
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN";
         Pos = MAP_APPFONT ( 12 , 92 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Hidden text" ;
     };
     CheckBox CB_FLD_HIDDEN
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN";
         Pos = MAP_APPFONT ( 12 , 105 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Fields: Hidden te~xt" ;
     };
     CheckBox CB_FLD_HIDDEN_PARA
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA";
         Pos = MAP_APPFONT ( 12 , 118 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Fields: Hidden p~aragraphs" ;
@@ -888,6 +962,7 @@ TabPage TP_OPTSHDWCRSR
     };
     CheckBox CB_SHDWCRSONOFF
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF";
         Pos = MAP_APPFONT ( 136 , 14 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -903,6 +978,7 @@ TabPage TP_OPTSHDWCRSR
     };
     RadioButton RB_SHDWCRSFILLMARGIN
     {
+        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN";
         Pos = MAP_APPFONT ( 145 , 39 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -911,18 +987,21 @@ TabPage TP_OPTSHDWCRSR
     };
     RadioButton RB_SHDWCRSFILLINDENT
     {
+        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT";
         Pos = MAP_APPFONT ( 145 , 52 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Left paragraph margin" ;
     };
     RadioButton RB_SHDWCRSFILLTAB
     {
+        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB";
         Pos = MAP_APPFONT ( 145 , 66 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Tabs" ;
     };
     RadioButton RB_SHDWCRSFILLSPACE
     {
+        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE";
         Pos = MAP_APPFONT ( 145 , 79 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "Tabs a~nd spaces" ;
@@ -935,12 +1014,25 @@ TabPage TP_OPTSHDWCRSR
     };
     CheckBox CB_ALLOW_IN_PROT
     {
+        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT";
         Pos = MAP_APPFONT ( 136 , 107 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
         Group = TRUE ;
         Text [ en-US ] = "Enable";
     };
+    FixedLine FL_LAYOUT_OPTIONS
+    {
+        Pos = MAP_APPFONT ( 6 , 133 ) ;
+        Size = MAP_APPFONT ( 118 , 8 ) ;
+        Text [ en-US ] = "Layout assistance";
+    };
+    CheckBox CB_MATH_BASELINE_ALIGNMENT
+    {
+        Pos = MAP_APPFONT ( 12 , 144 ) ;
+        Size = MAP_APPFONT ( 236 , 10 ) ;
+        Text [ en-US ] = "Math baseline alignment";
+    };
 };
 
 
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 618c0db35b..9fad441773 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -53,6 +53,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     RadioButton RB_ALWAYS
     {
+        HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS";
         Pos = MAP_APPFONT ( 18 , 26 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         TabStop = TRUE ;
@@ -60,6 +61,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     RadioButton RB_REQUEST
     {
+        HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST";
         Pos = MAP_APPFONT ( 18 , 39 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         TabStop = TRUE ;
@@ -67,6 +69,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     RadioButton RB_NEVER
     {
+        HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER";
         Pos = MAP_APPFONT ( 18 , 52 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         TabStop = TRUE ;
@@ -80,12 +83,14 @@ TabPage TP_OPTLOAD_PAGE
     };
     CheckBox CB_AUTO_UPDATE_FIELDS
     {
+        HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS";
         Pos = MAP_APPFONT ( 136 , 26) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~Fields";
     };
     CheckBox CB_AUTO_UPDATE_CHARTS
     {
+        HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS";
         Pos = MAP_APPFONT ( 136 , 39) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Text [ en-US ] = "~Charts";
@@ -104,6 +109,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     ListBox LB_METRIC
     {
+        HelpID = "sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC";
         Pos = MAP_APPFONT ( 130, 77 ) ;
         Size = MAP_APPFONT ( 50 , 50 ) ;
         Border = TRUE ;
@@ -118,6 +124,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     MetricField MF_TAB
     {
+        HelpID = "sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 93 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -134,6 +141,7 @@ TabPage TP_OPTLOAD_PAGE
     };
     CheckBox CB_USE_SQUARE_PAGE_MODE
     {
+        HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_SQUARE_PAGE_MODE";
         Pos = MAP_APPFONT ( 12 , 111) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Use square page mode for text grid";
@@ -173,6 +181,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ListBox LB_ORDER
     {
+        HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_ORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 141 ) ;
         Size = MAP_APPFONT ( 106 , 60 ) ;
@@ -222,6 +231,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ComboBox BOX_CATEGORY
     {
+        HelpID = "sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY";
         Pos = MAP_APPFONT ( 189 , 14 ) ;
         Size = MAP_APPFONT ( 59 , 61 ) ;
         DropDown = TRUE ;
@@ -237,6 +247,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ListBox BOX_FORMAT
     {
+        HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 189 , 29 ) ;
         Size = MAP_APPFONT ( 59 , 61 ) ;
@@ -252,6 +263,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     Edit ED_NUM_SEP
     {
+        HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:ED_NUM_SEP";
         Pos = MAP_APPFONT ( 189 , 44 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
         Border = TRUE ;
@@ -268,6 +280,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     Edit EDT_TEXT
     {
+        HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT";
         Pos = MAP_APPFONT ( 189 , 59 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
         Border = TRUE ;
@@ -283,6 +296,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ListBox BOX_POS
     {
+        HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS";
         Pos = MAP_APPFONT ( 189 , 74 ) ;
         Size = MAP_APPFONT ( 59 , 61 ) ;
         DropDown = TRUE ;
@@ -304,6 +318,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ListBox LB_LEVEL
     {
+        HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 189 , 100 ) ;
         Size = MAP_APPFONT ( 59 , 60 ) ;
@@ -322,6 +337,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     Edit ED_SEPARATOR
     {
+        HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR";
         Pos = MAP_APPFONT ( 189 , 115 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
         Border = TRUE ;
@@ -342,6 +358,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     ListBox LB_CHARSTYLE
     {
+        HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 189 , 141 ) ;
         Size = MAP_APPFONT ( 59 , 60 ) ;
@@ -354,6 +371,7 @@ TabPage TP_OPTCAPTION_PAGE
     };
     CheckBox CB_APPLYBORDER
     {
+        HelpID = "sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER";
         Pos = MAP_APPFONT ( 125 , 158 ) ;
         Size = MAP_APPFONT ( 124 , 10 ) ;
         Text [ en-US ] = "Apply border and shadow" ;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8d3943834c..126cc68852 100755..100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -27,79 +27,62 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #ifdef SW_DLLIMPLEMENTATION
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-#include <hintids.hxx>
-#ifndef _CMDID_H
-#include <cmdid.h>
-#endif
-#include <vcl/svapp.hxx>
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
 #endif
-#include <svl/cjkoptions.hxx>
-#include <svtools/ctrltool.hxx>
-#include <svl/eitem.hxx>
-#include <svx/htmlmode.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/bindings.hxx>
-#include <svx/xtable.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/langitem.hxx>
-#include <svx/dlgutil.hxx>
+
+#include <optpage.hxx>
+#include <doc.hxx>
+#include <hintids.hxx>
+#include <cmdid.h>
 #include <fmtcol.hxx>
 #include <charatr.hxx>
 #include <swtypes.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
-#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED
 #include <IDocumentDeviceAccess.hxx>
-#endif
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <uitool.hxx>
-#include <cfgitems.hxx> //Items fuer Sw-Seiten
+#include <cfgitems.hxx>
 #include <poolfmt.hxx>
 #include <uiitems.hxx>
 #include <initui.hxx>
-#include <optpage.hxx>
-#include <swprtopt.hxx>
-#ifndef _MODCFG_HXX
+#include <printdata.hxx>
 #include <modcfg.hxx>
-#endif
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <crstate.hxx>
 #include <viewopt.hxx>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _CONFIG_HRC
 #include <config.hrc>
-#endif
-#ifndef _REDLOPT_HRC
 #include <redlopt.hrc>
-#endif
-#ifndef _OPTDLG_HRC
 #include <optdlg.hrc>
-#endif
-#include <svx/strarray.hxx>
-#include <svl/slstitm.hxx>
-#include <sfx2/request.hxx>
 #include <swwrtshitem.hxx>
+#include <unomid.h>
+
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/langitem.hxx>
+#include <sfx2/request.hxx>
+#include <sfx2/printer.hxx>
+#include <sfx2/bindings.hxx>
+#include <svl/slstitm.hxx>
 #include <svl/ctloptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/cjkoptions.hxx>
+#include <svtools/ctrltool.hxx>
+#include <svx/htmlmode.hxx>
+#include <svx/xtable.hxx>
+#include <svx/dlgutil.hxx>
+#include <svx/strarray.hxx>
+#include <vcl/svapp.hxx>
 
-#include <unomid.h>
 
 
 using namespace ::com::sun::star;
@@ -1510,6 +1493,7 @@ IMPL_LINK(SwTableOptionsTabPage, CheckBoxHdl, CheckBox*, EMPTYARG)
     aRepeatHeaderCB.Enable(aHeaderCB.IsChecked());
     return 0;
 }
+
 void SwTableOptionsTabPage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,sal_False);
@@ -1547,15 +1531,17 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
     aFillTabRB( this, SW_RES( RB_SHDWCRSFILLTAB )),
     aFillSpaceRB( this, SW_RES( RB_SHDWCRSFILLSPACE )),
     aCrsrOptFL   ( this, SW_RES( FL_CRSR_OPT)),
-    aCrsrInProtCB( this, SW_RES( CB_ALLOW_IN_PROT ))
+    aCrsrInProtCB( this, SW_RES( CB_ALLOW_IN_PROT )),
+    m_aLayoutOptionsFL( this, SW_RES( FL_LAYOUT_OPTIONS ) ),
+    m_aMathBaselineAlignmentCB( this, SW_RES( CB_MATH_BASELINE_ALIGNMENT ) ),
+    m_pWrtShell( NULL )
 {
     FreeResource();
     const SfxPoolItem* pItem = 0;
-    SwShadowCursorItem aOpt;
 
+    SwShadowCursorItem aOpt;
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, FALSE, &pItem ))
         aOpt = *(SwShadowCursorItem*)pItem;
-
     aOnOffCB.Check( aOpt.IsOn() );
 
     BYTE eMode = aOpt.GetMode();
@@ -1600,6 +1586,15 @@ SfxTabPage*	SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet&
     return new SwShdwCrsrOptionsTabPage( pParent, rSet );
 }
 
+
+void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet )
+{
+    SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,sal_False);
+    if (pWrtSh)
+        SetWrtShell(pWrtSh->GetValue());
+}
+
+
 BOOL SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 {
     SwShadowCursorItem aOpt;
@@ -1625,6 +1620,10 @@ BOOL SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
         bRet = TRUE;
     }
 
+    m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, 
+            m_aMathBaselineAlignmentCB.IsChecked() );
+    bRet |= m_aMathBaselineAlignmentCB.IsChecked() != m_aMathBaselineAlignmentCB.GetSavedValue();
+
     if( aCrsrInProtCB.IsChecked() != aCrsrInProtCB.GetSavedValue())
     {
         rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, aCrsrInProtCB.IsChecked()));
@@ -1658,11 +1657,10 @@ BOOL SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem = 0;
-    SwShadowCursorItem aOpt;
 
+    SwShadowCursorItem aOpt;
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, FALSE, &pItem ))
         aOpt = *(SwShadowCursorItem*)pItem;
-
     aOnOffCB.Check( aOpt.IsOn() );
 
     BYTE eMode = aOpt.GetMode();
@@ -1671,6 +1669,9 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
     aFillTabRB.Check( FILL_TAB == eMode );
     aFillSpaceRB.Check( FILL_SPACE == eMode );
 
+    m_aMathBaselineAlignmentCB.Check( m_pWrtShell->GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) );
+    m_aMathBaselineAlignmentCB.SaveValue();
+
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, FALSE, &pItem ))
         aCrsrInProtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
     aCrsrInProtCB.SaveValue();
@@ -2615,4 +2616,3 @@ IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
 #endif
 
 
-
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index b6631686df..188db077cf 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -28,16 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <unotools/configmgr.hxx>
 #include <prtopt.hxx>
-#include <swprtopt.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <unomid.h>
 
+
 using namespace utl;
 using rtl::OUString;
 using namespace com::sun::star::uno;
diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src
index 2d5da19772..35211f60a7 100644
--- a/sw/source/ui/config/redlopt.src
+++ b/sw/source/ui/config/redlopt.src
@@ -65,6 +65,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_INS_ATTR
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR";
         Pos = MAP_APPFONT ( 90 , 25 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -92,6 +93,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_INS_COL
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_COL";
         Pos = MAP_APPFONT ( 90 , 40 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -118,6 +120,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_DEL_ATTR
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR";
         Pos = MAP_APPFONT ( 90 , 67 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -131,6 +134,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_DEL_COL
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL";
         Pos = MAP_APPFONT ( 90 , 82 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -157,6 +161,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_CHG_ATTR
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR";
         Pos = MAP_APPFONT ( 90 , 111 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -170,6 +175,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_CHG_COL
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL";
         Pos = MAP_APPFONT ( 90 , 126 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -196,6 +202,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_MARKPOS
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS";
         Pos = MAP_APPFONT ( 90 , 155 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -217,6 +224,7 @@ TabPage TP_REDLINE_OPT
     };
     ListBox LB_LC_COL
     {
+        HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_LC_COL";
         Pos = MAP_APPFONT ( 90 , 170 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 2571361b6d..46cd317ed1 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -245,27 +245,29 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames()
 {
     static const char* aPropNames[] =
     {
-        "Line/Guide",                       // 0
-        "Line/SimpleControlPoint",          // 1
-        "Line/LargeControlPoint",           // 2
-        "Window/HorizontalScroll",          // 3
-        "Window/VerticalScroll",            // 4
-        "Window/ShowRulers",                // 5
-        "Window/HorizontalRuler",           // 6
-        "Window/VerticalRuler",             // 7
-        "Window/HorizontalRulerUnit",       // 8
-        "Window/VerticalRulerUnit",         // 9
-        "Window/SmoothScroll",              //10
-        "Zoom/Value",                       //11
-        "Zoom/Type",                        //12
-        "Other/MeasureUnit",                //13
-        "Other/TabStop",                    //14
-        "Window/IsVerticalRulerRight",      //15
-        "ViewLayout/Columns",               //16
-        "ViewLayout/BookMode",              //17
-        "Other/IsSquaredPageMode"           //18
+        "Line/Guide",                           // 0
+        "Line/SimpleControlPoint",              // 1
+        "Line/LargeControlPoint",               // 2
+        "Window/HorizontalScroll",              // 3
+        "Window/VerticalScroll",                // 4
+        "Window/ShowRulers",                    // 5
+        "Window/HorizontalRuler",               // 6
+        "Window/VerticalRuler",                 // 7
+        "Window/HorizontalRulerUnit",           // 8
+        "Window/VerticalRulerUnit",             // 9
+        "Window/SmoothScroll",                  //10
+        "Zoom/Value",                           //11
+        "Zoom/Type",                            //12
+        "Other/IsAlignMathObjectsToBaseline",   //13
+        "Other/MeasureUnit",                    //14
+        // below properties are not available in WriterWeb
+        "Other/TabStop",                        //15
+        "Window/IsVerticalRulerRight",          //16
+        "ViewLayout/Columns",                   //17
+        "ViewLayout/BookMode",                  //18
+        "Other/IsSquaredPageMode"               //19
     };
-    const int nCount = bWeb ? 14 : 19;
+    const int nCount = bWeb ? 15 : 20;
     Sequence<OUString> aNames(nCount);
     OUString* pNames = aNames.getArray();
     for(int i = 0; i < nCount; i++)
@@ -302,39 +304,38 @@ void SwLayoutViewConfig::Commit()
 
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
-        sal_Bool bSet;
+        Any &rVal = pValues[nProp];
         switch(nProp)
         {
-            case  0: bSet = rParent.IsCrossHair(); break;// "Line/Guide",
-            case  1: bSet = rParent.IsSolidMarkHdl(); break;// "Line/SimpleControlPoint",
-            case  2: bSet = rParent.IsBigMarkHdl(); break;// "Line/LargeControlPoint",
-            case  3: bSet = rParent.IsViewHScrollBar(); break;// "Window/HorizontalScroll",
-            case  4: bSet = rParent.IsViewVScrollBar(); break;// "Window/VerticalScroll",
-            case  5: bSet = rParent.IsViewAnyRuler(); break; // "Window/ShowRulers"
+            case  0: rVal <<= (sal_Bool) rParent.IsCrossHair(); break;              // "Line/Guide",
+            case  1: rVal <<= (sal_Bool) rParent.IsSolidMarkHdl(); break;           // "Line/SimpleControlPoint",
+            case  2: rVal <<= (sal_Bool) rParent.IsBigMarkHdl(); break;             // "Line/LargeControlPoint",
+            case  3: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break;         // "Window/HorizontalScroll",
+            case  4: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break;         // "Window/VerticalScroll",
+            case  5: rVal <<= (sal_Bool) rParent.IsViewAnyRuler(); break;           // "Window/ShowRulers"
             // #i14593# use IsView*Ruler(TRUE) instead of IsView*Ruler()
             // this preserves the single ruler states even if "Window/ShowRulers" is off
-            case  6: bSet = rParent.IsViewHRuler(TRUE); break;// "Window/HorizontalRuler",
-            case  7: bSet = rParent.IsViewVRuler(TRUE); break;// "Window/VerticalRuler",
+            case  6: rVal <<= (sal_Bool) rParent.IsViewHRuler(TRUE); break;         // "Window/HorizontalRuler",
+            case  7: rVal <<= (sal_Bool) rParent.IsViewVRuler(TRUE); break;         // "Window/VerticalRuler",
             case  8:
                 if(rParent.bIsHScrollMetricSet)
-                    pValues[nProp] <<= (sal_Int32)rParent.eHScrollMetric; // "Window/HorizontalRulerUnit"
+                    rVal <<= (sal_Int32)rParent.eHScrollMetric;                     // "Window/HorizontalRulerUnit"
             break;
             case  9:
                 if(rParent.bIsVScrollMetricSet)
-                    pValues[nProp] <<= (sal_Int32)rParent.eVScrollMetric; // "Window/VerticalRulerUnit"
+                    rVal <<= (sal_Int32)rParent.eVScrollMetric;                     // "Window/VerticalRulerUnit"
             break;
-            case 10: bSet = rParent.IsSmoothScroll(); break;// "Window/SmoothScroll",
-            case 11: pValues[nProp] <<= (sal_Int32)rParent.GetZoom(); break;// "Zoom/Value",
-            case 12: pValues[nProp] <<= (sal_Int32)rParent.GetZoomType(); break;// "Zoom/Type",
-            case 13: pValues[nProp] <<= (sal_Int32)rParent.GetMetric(); break;// "Other/MeasureUnit",
-            case 14: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
-            case 15: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
-            case 16: pValues[nProp] <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;// "ViewLayout/Columns",
-            case 17: bSet = rParent.IsViewLayoutBookMode(); break;// "ViewLayout/BookMode",
-            case 18: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
+            case 10: rVal <<= (sal_Bool) rParent.IsSmoothScroll(); break;           // "Window/SmoothScroll",
+            case 11: rVal <<= (sal_Int32)rParent.GetZoom(); break;                  // "Zoom/Value",
+            case 12: rVal <<= (sal_Int32)rParent.GetZoomType(); break;              // "Zoom/Type",
+            case 13: rVal <<= (sal_Bool) rParent.IsAlignMathObjectsToBaseline(); break;      // "Other/IsAlignMathObjectsToBaseline"
+            case 14: rVal <<= (sal_Int32)rParent.GetMetric(); break;                // "Other/MeasureUnit",
+            case 15: rVal <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
+            case 16: rVal <<= (sal_Bool) rParent.IsVRulerRight(); break;            // "Window/IsVerticalRulerRight",
+            case 17: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;     // "ViewLayout/Columns",
+            case 18: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break;     // "ViewLayout/BookMode",
+            case 19: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break;        // "Other/IsSquaredPageMode",
         }
-        if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 )
-            pValues[nProp].setValue(&bSet, ::getBooleanCppuType());
     }
     PutProperties(aNames, aValues);
 }
@@ -353,7 +354,11 @@ void SwLayoutViewConfig::Load()
         {
             if(pValues[nProp].hasValue())
             {
-                sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+                sal_Int32   nInt32Val   = 0;
+                sal_Bool    bSet        = sal_False;
+                pValues[nProp] >>= nInt32Val;
+                pValues[nProp] >>= bSet;
+
                 switch(nProp)
                 {
                     case  0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
@@ -367,58 +372,25 @@ void SwLayoutViewConfig::Load()
                     case  8:
                     {
                         rParent.bIsHScrollMetricSet = sal_True;
-                        sal_Int32 nUnit = 0;
-                        pValues[nProp] >>= nUnit;
-                        rParent.eHScrollMetric = ((FieldUnit)nUnit);  // "Window/HorizontalRulerUnit"
+                        rParent.eHScrollMetric = ((FieldUnit)nInt32Val);  // "Window/HorizontalRulerUnit"
                     }
                     break;
                     case  9:
                     {
                         rParent.bIsVScrollMetricSet = sal_True;
-                        sal_Int32 nUnit = 0;
-                        pValues[nProp] >>= nUnit;
-                        rParent.eVScrollMetric = ((FieldUnit)nUnit); // "Window/VerticalRulerUnit"
+                        rParent.eVScrollMetric = ((FieldUnit)nInt32Val); // "Window/VerticalRulerUnit"
                     }
                     break;
                     case 10: rParent.SetSmoothScroll(bSet); break;// "Window/SmoothScroll",
-                    case 11:
-                    {
-                        sal_Int32 nVal = 0;
-                        pValues[nProp] >>= nVal;
-                        rParent.SetZoom( static_cast< USHORT >(nVal) );
-                    }
-                    break;// "Zoom/Value",
-                    case 12:
-                    {
-                        sal_Int32 nVal = 0;
-                        pValues[nProp] >>= nVal;
-                        rParent.SetZoomType( static_cast< SvxZoomType >(nVal) );
-                    }
-                    break;// "Zoom/Type",
-                    case 13:
-                    {
-                        sal_Int32 nUnit = 0;
-                        pValues[nProp] >>= nUnit;
-                        rParent.SetMetric((FieldUnit)nUnit, TRUE);
-                    }
-                    break;// "Other/MeasureUnit",
-                    case 14:
-                    {
-                        sal_Int32 nTab = 0;
-                        pValues[nProp] >>= nTab;
-                        rParent.SetDefTab(MM100_TO_TWIP(nTab), TRUE);
-                    }
-                    break;// "Other/TabStop",
-                    case 15: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
-                    case 16:
-                    {
-                        sal_Int32 nColumns = 0;
-                        pValues[nProp] >>= nColumns;
-                        rParent.SetViewLayoutColumns( static_cast<USHORT>(nColumns) );
-                    }
-                    break;// "ViewLayout/Columns",
-                    case 17: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
-                    case 18: rParent.SetDefaultPageMode(bSet,TRUE); break;// "Other/IsSquaredPageMode",
+                    case 11: rParent.SetZoom( static_cast< USHORT >(nInt32Val) ); break;// "Zoom/Value",
+                    case 12: rParent.SetZoomType( static_cast< SvxZoomType >(nInt32Val) ); break;// "Zoom/Type",
+                    case 13: rParent.SetAlignMathObjectsToBaseline(bSet); break;// "Other/IsAlignMathObjectsToBaseline"
+                    case 14: rParent.SetMetric((FieldUnit)nInt32Val, TRUE); break;// "Other/MeasureUnit",
+                    case 15: rParent.SetDefTab(MM100_TO_TWIP(nInt32Val), TRUE); break;// "Other/TabStop",
+                    case 16: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
+                    case 17: rParent.SetViewLayoutColumns( static_cast<USHORT>(nInt32Val) ); break;// "ViewLayout/Columns",
+                    case 18: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
+                    case 19: rParent.SetDefaultPageMode(bSet,TRUE); break;// "Other/IsSquaredPageMode",
                 }
             }
         }
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index c543cf702c..4ddc467655 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -219,7 +219,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) :
 
     m_aListLB.SetHelpId(HID_MM_ADDRESSLIST_TLB);
     static long nTabs[] = {2, 0, aSz.Width()/2 };
-    m_aListLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+    m_aListLB.SetStyle( m_aListLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_aListLB.SetSelectionMode( SINGLE_SELECTION );
     m_aListLB.SetTabs(&nTabs[0], MAP_PIXEL);
     m_aOK.SetClickHdl( LINK( this, SwAddressListDialog, OKHdl_Impl));
diff --git a/sw/source/ui/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src
index 64fcaf7806..a9f933ecda 100644
--- a/sw/source/ui/dbui/addresslistdialog.src
+++ b/sw/source/ui/dbui/addresslistdialog.src
@@ -61,30 +61,35 @@ ModalDialog DLG_MM_ADDRESSLISTDIALOG
     };
     PushButton       PB_LOADLIST
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST";
         Pos = MAP_APPFONT ( 194 , 43 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Add...";
     };
     PushButton PB_CREATELIST
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST";
         Pos = MAP_APPFONT ( 194 , 60 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Create...";
     };
     PushButton      PB_FILTER
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER";
         Pos = MAP_APPFONT ( 194 , 77 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Filter...";
     };
     PushButton PB_EDIT
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT";
         Pos = MAP_APPFONT ( 194 , 94 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Edit...";
     };
     PushButton PB_TABLE
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE";
         Pos = MAP_APPFONT ( 194 , 111 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Change ~Table...";
diff --git a/sw/source/ui/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src
index c1c0c1c748..dabce5ecc9 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.src
+++ b/sw/source/ui/dbui/createaddresslistdialog.src
@@ -70,24 +70,28 @@ ModalDialog DLG_MM_CREATEADDRESSLIST
     };
     PushButton              PB_NEW
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW";
         Pos = MAP_APPFONT ( 262 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~New";
     };
     PushButton              PB_DELETE
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_DELETE";
         Pos = MAP_APPFONT ( 262 , 32 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
     };
     PushButton              PB_FIND
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_FIND";
         Pos = MAP_APPFONT ( 262 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Find...";
     };
     PushButton              PB_CUSTOMIZE
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_CUSTOMIZE";
         Pos = MAP_APPFONT ( 262 , 68 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "C~ustomize...";
@@ -100,18 +104,21 @@ ModalDialog DLG_MM_CREATEADDRESSLIST
     };
     PushButton              PB_START
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_START";
         Pos = MAP_APPFONT ( 100 , 180 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = "|<";
     };
     PushButton              PB_PREV
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_PREV";
         Pos = MAP_APPFONT ( 123 , 180 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = "<";
     };
     NumericField            NF_SETNO
     {
+        HelpID = "sw:NumericField:DLG_MM_CREATEADDRESSLIST:NF_SETNO";
         Pos = MAP_APPFONT ( 146 , 180 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Border = TRUE;
@@ -125,12 +132,14 @@ ModalDialog DLG_MM_CREATEADDRESSLIST
     };
     PushButton              PB_NEXT
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEXT";
         Pos = MAP_APPFONT ( 169 , 180 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = ">";
     };
     PushButton              PB_END
     {
+        HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_END";
         Pos = MAP_APPFONT ( 192 , 180 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = ">|";
@@ -185,18 +194,21 @@ ModelessDialog DLG_MM_FIND_ENTRY
     };
     Edit      ED_FIND
     {
+        HelpID = "sw:Edit:DLG_MM_FIND_ENTRY:ED_FIND";
         Pos = MAP_APPFONT ( 6 ,  14) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
         Border = TRUE;
     };
     CheckBox  CB_FINDONLY
     {
+        HelpID = "sw:CheckBox:DLG_MM_FIND_ENTRY:CB_FINDONLY";
         Pos = MAP_APPFONT ( 6 , 32 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Text [ en-US ] = "Find ~only in";
     };
     ListBox   LB_FINDONLY
     {
+        HelpID = "sw:ListBox:DLG_MM_FIND_ENTRY:LB_FINDONLY";
         Pos = MAP_APPFONT ( 12 , 45 ) ;
         Size = MAP_APPFONT ( 114 , 50 ) ;
         Border = TRUE;
@@ -204,6 +216,7 @@ ModelessDialog DLG_MM_FIND_ENTRY
     };
     PushButton  PB_FIND
     {
+        HelpID = "sw:PushButton:DLG_MM_FIND_ENTRY:PB_FIND";
         Pos = MAP_APPFONT ( 132 , 3 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE;
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src
index 05892d90ec..b5a6881970 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.src
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.src
@@ -50,30 +50,35 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
     };
     ListBox                 LB_FIELDS
     {
+        HelpID = "sw:ListBox:DLG_MM_CUSTOMIZE_ADDRESS_LIST:LB_FIELDS";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 112 , 120 ) ;
         Border = TRUE;
     };
     PushButton              PB_ADD
     {
+        HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_ADD";
         Pos = MAP_APPFONT ( 144 , 3 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add...";
     };
     PushButton              PB_DELETE
     {
+        HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 20 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
     };
     PushButton              PB_RENAME
     {
+        HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_RENAME";
         Pos = MAP_APPFONT ( 144 , 37 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Rename...";
     };
     ImageButton              PB_UP
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP";
         Pos = MAP_APPFONT ( 124 , 58 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_UP;
@@ -81,6 +86,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
     };
     ImageButton              PB_DOWN
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN";
         Pos = MAP_APPFONT ( 124 , 75 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_DOWN;
@@ -129,6 +135,7 @@ ModalDialog DLG_MM_ADD_RENAME_ENTRY
     };
     Edit       ED_FIELDNAME
     {
+        HelpID = "sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src
index d08305dde1..5a3292d1d0 100644
--- a/sw/source/ui/dbui/dbinsdlg.src
+++ b/sw/source/ui/dbui/dbinsdlg.src
@@ -46,6 +46,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_TABLE
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE";
         Pos = MAP_APPFONT ( 80 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -54,6 +55,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_FIELD
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD";
         Pos = MAP_APPFONT ( 145 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -61,6 +63,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_TEXT
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT";
         Pos = MAP_APPFONT ( 210 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -106,6 +109,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_DB
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB";
         Pos = MAP_APPFONT ( 15 , 128 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -114,12 +118,14 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_USR
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR";
         Pos = MAP_APPFONT ( 15 , 143 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
     };
     ListBox LB_DBFMT_FROM_USR
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 30 , 142 ) ;
         Size = MAP_APPFONT ( 75 , 44 ) ;
@@ -130,6 +136,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     /* -------------- Page Text / Fields -------------------------------- */
     ListBox LB_TXT_DB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 93 , 70 ) ;
@@ -138,6 +145,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_TOEDIT
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT";
         Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -153,6 +161,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     MultiLineEdit ED_DB_TEXT
     {
+        HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 41 ) ;
         Size = MAP_APPFONT ( 142 , 70 ) ;
@@ -172,6 +181,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ListBox LB_DB_PARA_COLL
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 182 , 127 ) ;
         Size = MAP_APPFONT ( 97 , 59 ) ;
@@ -183,6 +193,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     /* -------------- Page Table ---------------------------------------- */
     ListBox LB_TBL_DB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 93 , 70 ) ;
@@ -190,6 +201,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ALL_TO
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO";
         Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -204,6 +216,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ONE_TO
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO";
         Pos = MAP_APPFONT ( 111 , 56 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -218,6 +231,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ONE_FROM
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM";
         Pos = MAP_APPFONT ( 111 , 84 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -232,6 +246,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ALL_FROM
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM";
         Pos = MAP_APPFONT ( 111 , 99 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -253,6 +268,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ListBox LB_TABLE_COL
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 41 ) ;
         Size = MAP_APPFONT ( 75 , 70 ) ;
@@ -265,6 +281,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     CheckBox CB_TABLE_HEADON
     {
+        HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON";
         Pos = MAP_APPFONT ( 111 , 128 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -273,6 +290,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_HEADL_COLNMS
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS";
         Pos = MAP_APPFONT ( 120 , 142 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -281,6 +299,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_HEADL_EMPTY
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY";
         Pos = MAP_APPFONT ( 120 , 155 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -288,6 +307,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     PushButton PB_TBL_FORMAT
     {
+        HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT";
         Pos = MAP_APPFONT ( 214 , 128 ) ;
         Size = MAP_APPFONT ( 65 , 12 ) ;
         Text [ en-US ] = "Pr~operties..." ;
@@ -295,6 +315,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     PushButton PB_TBL_AUTOFMT
     {
+        HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT";
         Pos = MAP_APPFONT ( 214 , 144 ) ;
         Size = MAP_APPFONT ( 65 , 12 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index d550c3b3af..052b48ba71 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -62,10 +62,8 @@
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/urihelper.hxx>
-#ifndef _SVSTDARR_HXX
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
-#endif
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svl/stritem.hxx>
@@ -86,7 +84,6 @@
 #include <swundo.hxx>
 #include <flddat.hxx>
 #include <modcfg.hxx>
-#include <swprtopt.hxx>
 #include <shellio.hxx>
 #include <dbui.hxx>
 #include <dbmgr.hxx>
@@ -137,6 +134,7 @@
 #include <memory>
 #include <vector>
 #include <unomid.h>
+#include <section.hxx>
 
 using namespace ::osl;
 using namespace ::svx;
@@ -845,6 +843,23 @@ void lcl_CopyFollowPageDesc(
     }
 }
 
+void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
+{
+    //reset all links of the sections of synchronized labels
+    USHORT nSections = rWorkShell.GetSectionFmtCount();
+    for( USHORT nSection = 0; nSection < nSections; ++nSection )
+    {
+        SwSectionData aSectionData( *rWorkShell.GetSectionFmt( nSection ).GetSection() );
+        if( aSectionData.GetType() == FILE_LINK_SECTION )
+        {
+            aSectionData.SetType( CONTENT_SECTION );
+            aSectionData.SetLinkFileName( String() );
+            rWorkShell.UpdateSection( nSection, aSectionData );
+        }    
+    }    
+    rWorkShell.SetLabelDoc( sal_False );
+}    
+
 BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
         const SwMergeDescriptor& rMergeDescriptor)
 {
@@ -1085,6 +1100,10 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                 // copy created file into the target document
                                 rWorkShell.ConvertFieldsToText();
                                 rWorkShell.SetNumberingRestart();
+                                if( bSynchronizedDoc )
+                                {
+                                    lcl_RemoveSectionLinks( rWorkShell );
+                                }    
 
                                 // insert the document into the target document
                                 rWorkShell.SttEndDoc(FALSE);
@@ -2934,7 +2953,10 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
             rWorkShell.RemoveInvisibleContent();
             rWorkShell.ConvertFieldsToText();
             rWorkShell.SetNumberingRestart();
-
+            if( bSynchronizedDoc )
+            {
+                lcl_RemoveSectionLinks( rWorkShell );
+            }    
 
             // insert the document into the target document
             rWorkShell.SttEndDoc(FALSE);
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 4b31760592..ba6c6bd225 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -260,7 +260,7 @@ void SwDBTreeList::InitTreeList()
     if(!pImpl->HasContext() && pImpl->GetWrtShell())
         return;
     SetSelectionMode(SINGLE_SELECTION);
-    SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+    SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
     // Font nicht setzen, damit der Font des Controls uebernommen wird!
     SetSpaceBetweenEntries(0);
     SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 8d073412ab..49ddd67948 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -31,6 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_DBSELECTION
 {
+    HelpID = "sw:ModalDialog:DLG_DBSELECTION";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 168 , 132 ) ;
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index e03b129034..94fd53a80f 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -418,7 +418,7 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
 
     m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB);
     static long nTabs[] = {3, 0, nPos1, aSz.Width() };
-    m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
+    m_aStatusLB.SetStyle( m_aStatusLB.GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_aStatusLB.SetSelectionMode( SINGLE_SELECTION );
     m_aStatusLB.SetTabs(&nTabs[0], MAP_PIXEL);
     m_aStatusLB.SetSpaceBetweenEntries(3);
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index 187f50b584..9e8253c917 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -258,6 +258,7 @@ ModalDialog DLG_MM_SENDWARNING
     };
     MultiLineEdit ED_DETAILS
     {
+        HelpID = "sw:MultiLineEdit:DLG_MM_SENDWARNING:ED_DETAILS";
         Pos = MAP_APPFONT ( 40 , 50 ) ;
         Size = MAP_APPFONT ( 194 , 50 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
index ad7d574800..2756f5ff7a 100644
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ b/sw/source/ui/dbui/mailmergewizard.src
@@ -30,6 +30,7 @@
 
 ModalDialog DLG_MAILMERGEWIZARD
 {
+    HelpID = "sw:ModalDialog:DLG_MAILMERGEWIZARD";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Text [ en-US ] = "Mail Merge Wizard" ;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ae6b6b0cb0..8d32644b12 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1097,6 +1097,25 @@ SwAssignFieldsControl::SwAssignFieldsControl(
     uno::Sequence< ::rtl::OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
     Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl);
     Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl);
+
+    static const char* aHIDs[] = 
+    {
+         HID_MM_HEADER_0,
+         HID_MM_HEADER_1,
+         HID_MM_HEADER_2,
+         HID_MM_HEADER_3,
+         HID_MM_HEADER_4,
+         HID_MM_HEADER_5,
+         HID_MM_HEADER_6,
+         HID_MM_HEADER_7,
+         HID_MM_HEADER_8,
+         HID_MM_HEADER_9,
+         HID_MM_HEADER_10,
+         HID_MM_HEADER_11,
+         HID_MM_HEADER_12,
+         HID_MM_HEADER_13
+    };
+
     //fill the controls
     for(USHORT i = 0; i < rHeaders.Count(); ++i)
     {
@@ -1106,7 +1125,7 @@ SwAssignFieldsControl::SwAssignFieldsControl(
         sLabel.Insert(rHeader, 1);
         pNewText->SetText(sLabel);
         ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr()));
-        pNewLB->SetHelpId( HID_MM_HEADER_0 + i );
+        pNewLB->SetHelpId( aHIDs[i] );
         pNewLB->SelectEntryPos(0);
         for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField)
             pNewLB->InsertEntry(pFields[nField]);
@@ -1434,7 +1453,7 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId)
         SvTreeListBox(pParent, rResId),
         m_pParentDialog(pParent)
 {
-    SetWindowBits( /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/
+    SetStyle( GetStyle() | /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/
                             WB_CLIPCHILDREN );
 //    SetSpaceBetweenEntries(3);
     SetSelectionMode( SINGLE_SELECTION );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index 7052b27f25..d06ced7e29 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -63,6 +63,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     PushButton      PB_ADDRESSLIST
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST";
         Pos = MAP_APPFONT ( 154 , 27 ) ;
         Size = MAP_APPFONT ( 100 , 14 ) ;
         Text[ en-US ] = "Select A~ddress List...";
@@ -91,6 +92,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     CheckBox        CB_ADDRESS
     {
+        HelpID = "sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS";
         Pos = MAP_APPFONT ( 16 , 66 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text[ en-US ] = "~This document shall contain an address block";
@@ -103,6 +105,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     PushButton      PB_SETTINGS
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS";
         Pos = MAP_APPFONT ( 194 , 110 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Group = FALSE;
@@ -110,6 +113,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     CheckBox CB_HIDE_EMPTY_PARA
     {
+        HelpID = "sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_HIDE_EMPTY_PARA";
         Pos = MAP_APPFONT ( 24 , 127 ) ;
         Size = MAP_APPFONT ( 230 , 10 ) ;
         Text[ en-US ] = "~Suppress lines with just empty fields";
@@ -134,6 +138,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     PushButton      PB_ASSIGN
     {
+        HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN";
         Pos = MAP_APPFONT ( 194 , 151 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text[ en-US ] = "Match ~Fields...";
@@ -169,6 +174,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     ImageButton     IB_PREVSET
     {
+        HelpID = "sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET";
         Pos = MAP_APPFONT ( 167 , 238 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         SYMBOL = IMAGEBUTTON_PREV;
@@ -176,6 +182,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
     ImageButton     IB_NEXTSET
     {
+        HelpID = "sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET";
         Pos = MAP_APPFONT ( 178 , 238 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         SYMBOL = IMAGEBUTTON_NEXT ;
@@ -215,18 +222,21 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK
     };
     PushButton      PB_NEW
     {
+        HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW";
         Pos = MAP_APPFONT ( 204 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~New...";
     };
     PushButton      PB_CUSTOMIZE
     {
+        HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE";
         Pos = MAP_APPFONT ( 204 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~Edit...";
     };
     PushButton      PB_DELETE
     {
+        HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE";
         Pos = MAP_APPFONT ( 204 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Group = FALSE;
@@ -241,24 +251,28 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK
     };
     RadioButton     RB_NEVER
     {
+        HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER";
         Pos = MAP_APPFONT ( 12 , 131 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "N~ever include the country/region";
     };
     RadioButton     RB_ALWAYS
     {
+        HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS";
         Pos = MAP_APPFONT ( 12 , 145 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "~Always include the country/region";
     };
     RadioButton     RB_DEPENDENT
     {
+        HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT";
         Pos = MAP_APPFONT ( 12 , 159 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "Only ~include the country/region if it is not:";
     };
     Edit ED_COUNTRY
     {
+        HelpID = "sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY";
         Pos = MAP_APPFONT ( 18 , 172 ) ;
         Size = MAP_APPFONT ( 180 , 12 ) ;
         Border = TRUE;
@@ -337,6 +351,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ImageButton     IB_INSERTFIELD
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD";
         Pos = MAP_APPFONT ( 80 , 29 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_RIGHT;
@@ -348,6 +363,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ImageButton     IB_REMOVEFIELD
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD";
         Pos = MAP_APPFONT ( 80 , 46 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_LEFT;
@@ -369,12 +385,14 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     MultiLineEdit ED_DRAG
     {
+        HelpID = "sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG";
         Pos = MAP_APPFONT ( 106 , 14 ) ;
         Size = MAP_APPFONT ( 160 , 60 ) ;
         Border = TRUE;
     };
     ImageButton     IB_UP
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP";
         Pos = MAP_APPFONT ( 285 , 14 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_UP;
@@ -382,6 +400,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ImageButton     IB_LEFT
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT";
         Pos = MAP_APPFONT ( 270 , 29 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_LEFT;
@@ -389,6 +408,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ImageButton     IB_RIGHT
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT";
         Pos = MAP_APPFONT ( 300 , 29 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_RIGHT;
@@ -396,6 +416,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ImageButton     IB_DOWN
     {
+        HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN";
         Pos = MAP_APPFONT ( 285 , 48 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_DOWN;
@@ -410,6 +431,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
     };
     ComboBox  CB_FIELD
     {
+        HelpID = "sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD";
         Pos = MAP_APPFONT ( 106 , 89 ) ;
         Size = MAP_APPFONT ( 160 , 50 ) ;
         Border = TRUE;
@@ -560,6 +582,7 @@ ModalDialog DLG_MM_ASSIGNFIELDS
         };
         ListBox LB_FIELDS
         {
+            HelpID = "sw:ListBox:DLG_MM_ASSIGNFIELDS:LB_FIELDS";
             Pos = MAP_APPFONT ( 83 , 4 ) ;
             Size = MAP_APPFONT ( 74 , 50 ) ;
             TabStop = TRUE;
diff --git a/sw/source/ui/dbui/mmdocselectpage.src b/sw/source/ui/dbui/mmdocselectpage.src
index ace679af4f..9f6c1df5df 100644
--- a/sw/source/ui/dbui/mmdocselectpage.src
+++ b/sw/source/ui/dbui/mmdocselectpage.src
@@ -47,48 +47,56 @@ TabPage DLG_MM_DOCSELECT_PAGE
     };
     RadioButton RB_CURRENTDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC";
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 190 , 10 ) ;
         Text[ en-US ] = "Use the current ~document";
     };
     RadioButton RB_NEWDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC";
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 190 , 10 ) ;
         Text[ en-US ] = "Create a ne~w document";
     };
     RadioButton RB_LOADDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC";
         Pos = MAP_APPFONT ( 12 ,  84) ;
         Size = MAP_APPFONT ( 190 , 10 ) ;
         Text[ en-US ] = "Start from ~existing document";
     };
     PushButton  PB_LOADDOC
     {
+        HelpID = "sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC";
         Pos = MAP_APPFONT ( 204 ,  80) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "B~rowse...";
     };
     RadioButton RB_LOADTEMPLATE
     {
+        HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE";
         Pos = MAP_APPFONT ( 12 , 103 ) ;
         Size = MAP_APPFONT ( 190 , 10 ) ;
         Text[ en-US ] = "Start from a t~emplate";
     };
     PushButton  PB_BROWSETEMPLATE
     {
+        HelpID = "sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE";
         Pos = MAP_APPFONT ( 204 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "B~rowse...";
     };
     RadioButton RB_RECENTDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC";
         Pos = MAP_APPFONT ( 12 ,  120) ;
         Size = MAP_APPFONT ( 190 , 10 ) ;
         Text[ en-US ] = "Start fro~m a recently saved starting document";
     };
     ListBox     LB_RECENTDOC
     {
+        HelpID = "sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC";
         Pos = MAP_APPFONT ( 20 , 134 ) ;
         Size = MAP_APPFONT ( 180 , 50 ) ;
         DropDown = TRUE;
diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src
index fff77d9240..5cae953a35 100644
--- a/sw/source/ui/dbui/mmgreetingspage.src
+++ b/sw/source/ui/dbui/mmgreetingspage.src
@@ -144,6 +144,7 @@ TabPage DLG_MM_GREETINGS_PAGE
     };
     CheckBox    CB_GREETINGLINE
     {
+        HelpID = "sw:CheckBox:DLG_MM_GREETINGS_PAGE:CB_GREETINGLINE";
         Pos = MAP_APPFONT ( 12 , 27 );
         Size = MAP_APPFONT ( 242 , 10 );
         Text[ en-US ] = "This document should contain a salutation";
@@ -163,6 +164,7 @@ TabPage DLG_MM_GREETINGS_PAGE
     };                                                                              
     PushButton      PB_ASSIGN
     {                                                                               
+        HelpID = "sw:PushButton:DLG_MM_GREETINGS_PAGE:PB_ASSIGN";
         Pos = MAP_APPFONT ( 204 , 179 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;                                            
         Text[ en-US ] = "~Match fields...";
@@ -175,6 +177,7 @@ TabPage DLG_MM_GREETINGS_PAGE
     };
     ImageButton     IB_PREVSET
     {
+        HelpID = "sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_PREVSET";
         Pos = MAP_APPFONT ( 177 , 204 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         SYMBOL = IMAGEBUTTON_PREV;
@@ -182,6 +185,7 @@ TabPage DLG_MM_GREETINGS_PAGE
     };
     ImageButton     IB_NEXTSET
     {
+        HelpID = "sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_NEXTSET";
         Pos = MAP_APPFONT ( 188 , 204 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         SYMBOL = IMAGEBUTTON_NEXT ;
@@ -208,6 +212,7 @@ ModalDialog DLG_MM_MAILBODY
     Text [ en-US ] = "E-Mail Message";
     CheckBox    CB_GREETINGLINE
     {                                                                               
+        HelpID = "sw:CheckBox:DLG_MM_MAILBODY:CB_GREETINGLINE";
         Pos = MAP_APPFONT ( 6  , 3 ) ;                    
         Size = MAP_APPFONT ( 242 , 10 ) ;                                           
         Text[ en-US ] = "This e-mail should contain a salutation";
@@ -221,6 +226,7 @@ ModalDialog DLG_MM_MAILBODY
     };
     MultiLineEdit MLE_BODY
     {
+        HelpID = "sw:MultiLineEdit:DLG_MM_MAILBODY:MLE_BODY";
         Pos = MAP_APPFONT ( 12,   151 ) ;
         Size = MAP_APPFONT ( 180 , 50 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src
index 07582a45ef..94e1387306 100644
--- a/sw/source/ui/dbui/mmlayoutpage.src
+++ b/sw/source/ui/dbui/mmlayoutpage.src
@@ -48,6 +48,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     CheckBox CB_ALIGN
     {
+        HelpID = "sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN";
         Pos = MAP_APPFONT ( 6 , 40 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text[ en-US ] = "Align to text body";
@@ -60,6 +61,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     MetricField     MF_LEFT
     {
+        HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT";
         Pos = MAP_APPFONT ( 78 , 52 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -83,6 +85,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     MetricField     MF_TOP
     {
+        HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP";
         Pos = MAP_APPFONT ( 78 , 67 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -112,6 +115,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     PushButton      MF_UP
     {
+        HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP";
         Pos = MAP_APPFONT ( 68 , 96 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~Up";
@@ -124,6 +128,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     PushButton      PB_DOWN
     {
+        HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN";
         Pos = MAP_APPFONT ( 68 , 113 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~Down";
@@ -143,6 +148,7 @@ TabPage DLG_MM_LAYOUT_PAGE
     };
     ListBox        LB_ZOOM
     {
+        HelpID = "sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM";
         Pos = MAP_APPFONT ( 204 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 50 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/dbui/mmmergepage.src b/sw/source/ui/dbui/mmmergepage.src
index fd9fffc0de..8480e97e0e 100644
--- a/sw/source/ui/dbui/mmmergepage.src
+++ b/sw/source/ui/dbui/mmmergepage.src
@@ -49,6 +49,7 @@ TabPage DLG_MM_MERGE_PAGE
     };
     PushButton PB_EDIT
     {
+        HelpID = "sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT";
         Pos = MAP_APPFONT ( 70 , 67 ) ;
         Size = MAP_APPFONT ( 120 , 14 ) ;
         Text [ en-US ] = "~Edit individual document...";
@@ -67,30 +68,35 @@ TabPage DLG_MM_MERGE_PAGE
     };
     Edit       ED_FIND
     {
+        HelpID = "sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND";
         Pos = MAP_APPFONT ( 55 ,114 ) ;
         Size = MAP_APPFONT ( 140 , 12 ) ;
         Border = TRUE;
     };
     PushButton PB_FIND
     {
+        HelpID = "sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND";
         Pos = MAP_APPFONT ( 198 ,113 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Find...";
     };
     CheckBox   CB_WHOLEWORDS
     {
+        HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS";
         Pos = MAP_APPFONT ( 55 , 131 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         Text [ en-US ] = "Whole wor~ds only";
     };
     CheckBox   CB_BACKWARDS
     {
+        HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS";
         Pos = MAP_APPFONT ( 55 , 144 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         Text [ en-US ] = "Back~wards";
     };
     CheckBox   CB_MATCHCASE
     {
+        HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE";
         Pos = MAP_APPFONT ( 55 , 157 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         Text [ en-US ] = "Ma~tch case";
diff --git a/sw/source/ui/dbui/mmoutputpage.src b/sw/source/ui/dbui/mmoutputpage.src
index 29e54bbb40..4801706083 100644
--- a/sw/source/ui/dbui/mmoutputpage.src
+++ b/sw/source/ui/dbui/mmoutputpage.src
@@ -48,24 +48,28 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     RadioButton RB_SAVESTARTDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC";
         Pos = MAP_APPFONT ( 45 , 40 ) ;
         Size = MAP_APPFONT ( 209 , 10 ) ;
         Text[ en-US ] = "~Save starting document";
     };
     RadioButton RB_SAVEMERGEDDOC
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC";
         Pos = MAP_APPFONT ( 45 , 53 ) ;
         Size = MAP_APPFONT ( 209 , 10 ) ;
         Text[ en-US ] = "Save ~merged document" ;
     };
     RadioButton RB_PRINT
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT";
         Pos = MAP_APPFONT ( 45 , 66 ) ;
         Size = MAP_APPFONT ( 209 , 10 ) ;
         Text[ en-US ] = "~Print merged document";
     };
     RadioButton RB_SENDMAIL
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL";
         Pos = MAP_APPFONT ( 45 , 79 ) ;
         Size = MAP_APPFONT ( 209 , 10 ) ;
         Text[ en-US ] = "Send merged document as ~E-Mail";
@@ -77,30 +81,35 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     PushButton  PB_SAVESTARTDOC
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC";
         Pos = MAP_APPFONT ( 55 , 108 ) ;
         Size = MAP_APPFONT ( 100 , 14 ) ;
         Text[ en-US ] = "Save starting ~document";
     };
     RadioButton RB_SAVEASONE
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE";
         Pos = MAP_APPFONT ( 45 , 109 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "S~ave as single document";
     };
     RadioButton RB_SAVEINDIVIDUAL
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL";
         Pos = MAP_APPFONT (  45, 123 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "Sa~ve as individual documents";
     };
     RadioButton RB_FROM
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM";
         Pos = MAP_APPFONT ( 45 , 137 ) ;
         Size = MAP_APPFONT ( 30 , 10 ) ;
         Text[ en-US ] = "~From";
     };
     NumericField NF_FROM
     {
+        HelpID = "sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM";
         Pos = MAP_APPFONT ( 78 , 136 ) ;
         Size = MAP_APPFONT ( 20 , 10 ) ;
         Border = TRUE;
@@ -120,6 +129,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     NumericField NF_TO
     {
+        HelpID = "sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO";
         Pos = MAP_APPFONT ( 124 , 136 ) ;
         Size = MAP_APPFONT ( 20 , 10 ) ;
         Border = TRUE;
@@ -132,6 +142,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     PushButton  PB_SAVENOW
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW";
         Pos = MAP_APPFONT ( 45 , 150 ) ;
         Size = MAP_APPFONT ( 80 , 14 ) ;
         Text[ en-US ] = "Save Do~cuments";
@@ -144,6 +155,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     ListBox     LB_PRINT
     {
+        HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT";
         Pos = MAP_APPFONT ( 45 , 109 ) ;
         Size = MAP_APPFONT ( 147 , 50 ) ;
         Border = TRUE;
@@ -152,18 +164,21 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     PushButton  PB_PRINTERSETTINGS
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS";
         Pos = MAP_APPFONT ( 198 , 108 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "P~roperties...";
     };
     RadioButton RB_PRINTALL
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL";
         Pos = MAP_APPFONT ( 45 , 126 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text[ en-US ] = "Print ~all documents";
     };
     PushButton  PB_PRINTNOW
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW";
         Pos = MAP_APPFONT ( 45 , 155 ) ;
         Size = MAP_APPFONT ( 80 , 14 ) ;
         Text[ en-US ] = "Prin~t Documents";
@@ -177,6 +192,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     ListBox          LB_MAILTO
     {
+        HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO";
         Pos = MAP_APPFONT ( 45 , 109 ) ;
         Size = MAP_APPFONT ( 147 , 50 ) ;
         DropDown = TRUE;
@@ -184,6 +200,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     PushButton       PB_COPYTO
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO";
         Pos = MAP_APPFONT ( 198 , 108 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "~Copy to...";
@@ -196,6 +213,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     Edit             ED_SUBJECT
     {
+        HelpID = "sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT";
         Pos = MAP_APPFONT ( 45 , 125 ) ;
         Size = MAP_APPFONT ( 147 , 12 ) ;
         Border = TRUE;
@@ -208,6 +226,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     ListBox          LB_SENDAS
     {
+        HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS";
         Pos = MAP_APPFONT ( 45 , 141 ) ;
         Size = MAP_APPFONT (147  , 70 ) ;
         DropDown = TRUE;
@@ -231,6 +250,7 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     PushButton       PB_SENDAS
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS";
         Pos = MAP_APPFONT ( 198 , 140 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text[ en-US ] = "Pr~operties...";
@@ -243,18 +263,21 @@ TabPage DLG_MM_OUTPUT_PAGE
     };
     Edit ED_ATTACHMENT
     {
+        HelpID = "sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT";
         Pos = MAP_APPFONT ( 45 , 168 ) ;
         Size = MAP_APPFONT ( 147 , 12 ) ;
         Border = TRUE;
     };
     RadioButton      RB_SENDALL
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL";
         Pos = MAP_APPFONT ( 45 , 184 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text[ en-US ] = "S~end all documents";
     };
     PushButton       PB_SENDDOCUMENTS
     {
+        HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS";
         Pos = MAP_APPFONT ( 45 , 212 ) ;
         Size = MAP_APPFONT ( 80 , 14 ) ;
         Text[ en-US ] = "Se~nd documents";
@@ -321,6 +344,7 @@ ModalDialog DLG_MM_COPYTO
     };
     Edit ED_CC
     {
+        HelpID = "sw:Edit:DLG_MM_COPYTO:ED_CC";
         Pos = MAP_APPFONT ( 40 , 15 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
         Border = TRUE;
@@ -333,6 +357,7 @@ ModalDialog DLG_MM_COPYTO
     };
     Edit ED_BCC
     {
+        HelpID = "sw:Edit:DLG_MM_COPYTO:ED_BCC";
         Pos = MAP_APPFONT ( 40 , 31 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
         Border = TRUE;
@@ -396,6 +421,7 @@ ModalDialog DLG_MM_SAVEWARNING
     };
     Edit ED_FILENAME
     {
+        HelpID = "sw:Edit:DLG_MM_SAVEWARNING:ED_FILENAME";
         Pos = MAP_APPFONT ( 40 , 50 ) ;
         Size = MAP_APPFONT ( 154 , 12 ) ;
         Border = TRUE;
@@ -439,6 +465,7 @@ ModalDialog DLG_MM_QUERY
     };
     Edit ED_TEXT
     {
+        HelpID = "sw:Edit:DLG_MM_QUERY:ED_TEXT";
         Pos = MAP_APPFONT ( 40 , 39 ) ;
         Size = MAP_APPFONT ( 194 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src
index a6dd74cc7a..72d7e39365 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.src
+++ b/sw/source/ui/dbui/mmoutputtypepage.src
@@ -48,12 +48,14 @@ TabPage DLG_MM_OUTPUTTYPE_PAGE
     };
     RadioButton RB_LETTER
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER";
         Pos = MAP_APPFONT ( 12 , 43 ) ;
         Size = MAP_APPFONT ( 240 , 10 ) ;
         Text[ en-US ] = "~Letter";
     };
     RadioButton RB_MAIL
     {
+        HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL";
         Pos = MAP_APPFONT ( 12 , 57 ) ;
         Size = MAP_APPFONT ( 240 , 10 ) ;
         Text[ en-US ] = "~E-mail message";
diff --git a/sw/source/ui/dbui/mmpreparemergepage.src b/sw/source/ui/dbui/mmpreparemergepage.src
index b1ecd375d4..c763cfa465 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.src
+++ b/sw/source/ui/dbui/mmpreparemergepage.src
@@ -57,6 +57,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
 
     PushButton  PB_FIRST
     {
+        HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST";
         Pos = MAP_APPFONT ( 75 , 55 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = "|<" ;
@@ -64,6 +65,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     PushButton  PB_PREV
     {
+        HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV";
         Pos = MAP_APPFONT ( 98 , 55 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = "<" ;
@@ -71,6 +73,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     NumericField ED_RECORD
     {
+        HelpID = "sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD";
         Pos = MAP_APPFONT ( 121 , 56 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         Border = TRUE ;
@@ -83,6 +86,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     PushButton  PB_NEXT
     {
+        HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT";
         Pos = MAP_APPFONT ( 144 , 55 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = ">" ;
@@ -90,6 +94,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     PushButton  PB_LAST
     {
+        HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST";
         Pos = MAP_APPFONT ( 167 , 55 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         Text = ">|" ;
@@ -97,6 +102,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     CheckBox CB_EXCLUDE
     {
+        HelpID = "sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE";
         Pos = MAP_APPFONT ( 75, 77 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text[ en-US ] = "E~xclude this recipient";
@@ -116,6 +122,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE
     };
     PushButton  PB_EDIT
     {
+        HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT";
         Pos = MAP_APPFONT ( 90 , 185 ) ;
         Size = MAP_APPFONT ( 80 , 14 ) ;
         Text[ en-US ] = "~Edit Document...";
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 51277a1fed..049b99e611 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -109,7 +109,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent,
     static long nTabs[] = {3, 0, aSz.Width()/2, aSz.Width() };
     m_aTableLB.SetTabs(&nTabs[0], MAP_PIXEL);
     m_aTableLB.SetHelpId(HID_MM_SELECTDBTABLEDDIALOG_LISTBOX);
-    m_aTableLB.SetWindowBits( WB_CLIPCHILDREN );
+    m_aTableLB.SetStyle( m_aTableLB.GetStyle() | WB_CLIPCHILDREN );
     m_aTableLB.SetSpaceBetweenEntries(3);
     m_aTableLB.SetSelectionMode( SINGLE_SELECTION );
     m_aTableLB.SetDragDropMode(   0 );
diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src
index 467cb8333e..61d68f6fde 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.src
+++ b/sw/source/ui/dbui/selectdbtabledialog.src
@@ -54,6 +54,7 @@ ModalDialog DLG_MM_SELECTDBTABLEDDIALOG
     };
     PushButton      PB_PREVIEW
     {
+        HelpID = "sw:PushButton:DLG_MM_SELECTDBTABLEDDIALOG:PB_PREVIEW";
         Pos = MAP_APPFONT ( 6 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Preview";
diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index ab5a86394b..a29b7e6339 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -53,6 +53,7 @@ ModalDialog DLG_INSERT_ABSTRACT
     };
     NumericField NF_LEVEL
     {
+        HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 153 , 12 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -75,6 +76,7 @@ ModalDialog DLG_INSERT_ABSTRACT
     };
     NumericField NF_PARA
     {
+        HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 153 , 27 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src
index f10fed8a87..66be6d35c9 100644
--- a/sw/source/ui/dialog/ascfldlg.src
+++ b/sw/source/ui/dialog/ascfldlg.src
@@ -50,6 +50,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     ListBox LB_CHARSET
     {
+        HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET";
         Pos = MAP_APPFONT ( 80 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 61 ) ;
         TabStop = TRUE ;
@@ -64,6 +65,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     ListBox LB_FONT
     {
+        HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_FONT";
         Pos = MAP_APPFONT ( 80 , 30 ) ;
         Size = MAP_APPFONT ( 90 , 61 ) ;
         TabStop = TRUE ;
@@ -78,6 +80,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE";
         Pos = MAP_APPFONT ( 80 , 46 ) ;
         Size = MAP_APPFONT ( 90 , 61 ) ;
         TabStop = TRUE ;
@@ -92,6 +95,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_CRLF
     {
+        HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF";
         Pos = MAP_APPFONT ( 80 , 64 ) ;
         Size = MAP_APPFONT ( 40 , 10 ) ;
         TabStop = TRUE ;
@@ -100,6 +104,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_CR
     {
+        HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CR";
         Pos = MAP_APPFONT ( 121 , 64 ) ;
         Size = MAP_APPFONT ( 20 , 10 ) ;
 //        TabStop = TRUE ;
@@ -107,6 +112,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_LF
     {
+        HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_LF";
         Pos = MAP_APPFONT ( 155 , 64 ) ;
         Size = MAP_APPFONT ( 20 , 10 ) ;
 //        TabStop = TRUE ;
diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src
index 5926321d88..3cce7454c5 100644
--- a/sw/source/ui/dialog/docstdlg.src
+++ b/sw/source/ui/dialog/docstdlg.src
@@ -140,6 +140,7 @@ TabPage TP_DOC_STAT
     };
     PushButton PB_PDATE
     {
+        HelpID = "sw:PushButton:TP_DOC_STAT:PB_PDATE";
         Pos = MAP_APPFONT ( 204 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Update" ;
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index e0da42f07f..833426fd8a 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -87,7 +87,7 @@
 *************************************************************************/
 ModalDialog MD_EDIT_REGION
 {
-    HelpID = FN_EDIT_REGION ;
+    HelpID = CMD_FN_EDIT_REGION ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 316 , 185 ) ;
@@ -102,6 +102,7 @@ ModalDialog MD_EDIT_REGION
     };
     Edit ED_RANAME
     {
+        HelpID = "sw:Edit:MD_EDIT_REGION:ED_RANAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -124,6 +125,7 @@ ModalDialog MD_EDIT_REGION
     };
     TriStateBox CB_FILE
     {
+        HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_FILE";
         Pos = MAP_APPFONT ( 98 , 14 ) ;
         Size = MAP_APPFONT ( 59 , 10 ) ;
         TabStop = TRUE ;
@@ -131,6 +133,7 @@ ModalDialog MD_EDIT_REGION
     };
     CheckBox CB_DDE
     {
+        HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_DDE";
         Pos = MAP_APPFONT ( 98 , 28 ) ;
         Size = MAP_APPFONT ( 30 , 10 ) ;
         Disable = TRUE ;
@@ -152,6 +155,7 @@ ModalDialog MD_EDIT_REGION
     };
     Edit ED_FILE
     {
+        HelpID = "sw:Edit:MD_EDIT_REGION:ED_FILE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 165 , 42 ) ;
         Size = MAP_APPFONT ( 68 , 12 ) ;
@@ -160,6 +164,7 @@ ModalDialog MD_EDIT_REGION
     };
     PushButton PB_FILE
     {
+        HelpID = "sw:PushButton:MD_EDIT_REGION:PB_FILE";
         Pos = MAP_APPFONT ( 239 , 42 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = TRUE ;
@@ -175,6 +180,7 @@ ModalDialog MD_EDIT_REGION
     };
     ComboBox LB_SUBREG
     {
+        HelpID = "sw:ComboBox:MD_EDIT_REGION:LB_SUBREG";
         Pos = MAP_APPFONT ( 165 , 57 ) ;
         Size = MAP_APPFONT ( 68 , 50 ) ;
         Disable = TRUE ;
@@ -191,6 +197,7 @@ ModalDialog MD_EDIT_REGION
     };
     TriStateBox CB_PROTECT
     {
+        HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT";
         Pos = MAP_APPFONT ( 98 , 86 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -200,6 +207,7 @@ ModalDialog MD_EDIT_REGION
     };
     CheckBox CB_PASSWD
     {
+        HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_PASSWD";
         Pos = MAP_APPFONT ( 107 , 100 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -207,6 +215,7 @@ ModalDialog MD_EDIT_REGION
     };
     PushButton PB_PASSWD
     {
+        HelpID = "sw:PushButton:MD_EDIT_REGION:PB_PASSWD";
         Pos = MAP_APPFONT ( 239 , 98 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = TRUE ;
@@ -221,6 +230,7 @@ ModalDialog MD_EDIT_REGION
     };
     TriStateBox CB_HIDE
     {
+        HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_HIDE";
         Pos = MAP_APPFONT ( 98 , 127 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -236,6 +246,7 @@ ModalDialog MD_EDIT_REGION
     };
     Edit ED_CONDITION
     {
+        HelpID = "sw:Edit:MD_EDIT_REGION:ED_CONDITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 165 , 141) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
@@ -252,6 +263,7 @@ ModalDialog MD_EDIT_REGION
     };
     TriStateBox CB_EDIT_IN_READONLY
     {
+        HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_EDIT_IN_READONLY";
         Pos = MAP_APPFONT ( 98 , 170 ) ;
         Size = MAP_APPFONT ( 156 , 10 ) ;
         TabStop = TRUE ;
@@ -275,6 +287,7 @@ ModalDialog MD_EDIT_REGION
     };
     PushButton PB_OPTIONS
     {
+        HelpID = "sw:PushButton:MD_EDIT_REGION:PB_OPTIONS";
         Pos = MAP_APPFONT ( 263 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -283,6 +296,7 @@ ModalDialog MD_EDIT_REGION
     };
     PushButton CB_DISMISS
     {
+        HelpID = "sw:PushButton:MD_EDIT_REGION:CB_DISMISS";
         Pos = MAP_APPFONT ( 263 , 57 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -412,6 +426,7 @@ TabPage TP_INSERT_SECTION
     };
     ComboBox ED_RNAME
     {
+        HelpID = "sw:ComboBox:TP_INSERT_SECTION:ED_RNAME";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 69 , 140 ) ;
         TabStop = TRUE ;
@@ -427,6 +442,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_FILE
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_FILE";
         Pos = MAP_APPFONT ( 96 , 14 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -434,6 +450,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_DDE
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_DDE";
         Pos = MAP_APPFONT ( 96 , 28) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Disable = TRUE ;
@@ -455,6 +472,7 @@ TabPage TP_INSERT_SECTION
     };
     Edit ED_FILE
     {
+        HelpID = "sw:Edit:TP_INSERT_SECTION:ED_FILE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 42 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -463,6 +481,7 @@ TabPage TP_INSERT_SECTION
     };
     PushButton PB_FILE
     {
+        HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_FILE";
         Pos = MAP_APPFONT ( 239 , 42 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Disable = TRUE ;
@@ -478,6 +497,7 @@ TabPage TP_INSERT_SECTION
     };
     ComboBox LB_SUBREG
     {
+        HelpID = "sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG";
         Pos = MAP_APPFONT ( 160 , 58 ) ;
         Size = MAP_APPFONT ( 76 , 50 ) ;
         DropDown = TRUE ;
@@ -494,6 +514,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_PROTECT
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT";
         Pos = MAP_APPFONT ( 96 , 87 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -501,6 +522,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_PASSWD
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD";
         Pos = MAP_APPFONT ( 105 , 101 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -508,6 +530,7 @@ TabPage TP_INSERT_SECTION
     };
     PushButton PB_PASSWD
     {
+        HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_PASSWD";
         Pos = MAP_APPFONT ( 239 , 99 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = TRUE ;
@@ -522,6 +545,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_HIDE
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_HIDE";
         Pos = MAP_APPFONT ( 96 , 128 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         CB_HIDE_TEXT
@@ -535,6 +559,7 @@ TabPage TP_INSERT_SECTION
     };
     Edit ED_CONDITION
     {
+        HelpID = "sw:Edit:TP_INSERT_SECTION:ED_CONDITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 142 ) ;
         Size = MAP_APPFONT ( 91 , 12 ) ;
@@ -551,6 +576,7 @@ TabPage TP_INSERT_SECTION
     };
     CheckBox CB_EDIT_IN_READONLY
     {
+        HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_EDIT_IN_READONLY";
         Pos = MAP_APPFONT ( 96 , 170 ) ;
         Size = MAP_APPFONT ( 158 , 10 ) ;
         CB_EDIT_IN_READONLY_TEXT
@@ -615,6 +641,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_FTN_AT_TXTEND
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -623,6 +650,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_FTN_NUM
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM";
         Pos = MAP_APPFONT ( 18 , 29 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -637,6 +665,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     NumericField FLD_FTN_OFFSET
     {
+        HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET";
         Pos = MAP_APPFONT ( 90 , 44 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Spin = TRUE ;
@@ -649,6 +678,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_FTN_NUM_FMT
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT";
         Pos = MAP_APPFONT ( 24 , 61 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -663,6 +693,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     Edit ED_FTN_PREFIX
     {
+        HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 74 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -672,6 +703,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     ListBox LB_FTN_NUMVIEW
     {
+        HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 74 ) ;
         Size = MAP_APPFONT ( 62 , 50 ) ;
@@ -688,6 +720,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     Edit ED_FTN_SUFFIX
     {
+        HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 74 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -706,6 +739,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_END_AT_TXTEND
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND";
         Pos = MAP_APPFONT ( 12 , 103 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -713,6 +747,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_END_NUM
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM";
         Pos = MAP_APPFONT ( 16 , 118 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -727,6 +762,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     NumericField FLD_END_OFFSET
     {
+        HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET";
         Pos = MAP_APPFONT ( 90 , 133 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Spin = TRUE ;
@@ -739,6 +775,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     CheckBox CB_END_NUM_FMT
     {
+        HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT";
         Pos = MAP_APPFONT ( 24 , 150 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -754,6 +791,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     Edit ED_END_PREFIX
     {
+        HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 163 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -763,6 +801,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     ListBox LB_END_NUMVIEW
     {
+        HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 163 ) ;
         Size = MAP_APPFONT ( 62 , 50 ) ;
@@ -780,6 +819,7 @@ TabPage TP_SECTION_FTNENDNOTES
     };
     Edit ED_END_SUFFIX
     {
+        HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 163 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -811,6 +851,7 @@ TabPage TP_SECTION_INDENTS
     };
     MetricField MF_BEFORE
     {
+        HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -834,6 +875,7 @@ TabPage TP_SECTION_INDENTS
     };
     MetricField MF_AFTER
     {
+        HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_AFTER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 9af9dfbd0b..284b26135a 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -451,9 +451,9 @@ String AbstractInsFootNoteDlg_Impl::GetStr()
 {
     return pDlg->GetStr();
 }
-void AbstractInsFootNoteDlg_Impl::SetHelpId( ULONG nHelpId )
+void AbstractInsFootNoteDlg_Impl::SetHelpId( const rtl::OString& sHelpId )
 {
-    pDlg->SetHelpId( nHelpId );
+    pDlg->SetHelpId( sHelpId );
 }
 void AbstractInsFootNoteDlg_Impl::SetText( const XubString& rStr )
 {
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 8c3355bb6b..3793d6c57f 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -283,7 +283,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
     virtual BOOL            IsEndNote();
     virtual String          GetStr();
     //from class Window
-    virtual void    SetHelpId( ULONG nHelpId );
+    virtual void    SetHelpId( const rtl::OString& sHelpId );
     virtual void    SetText( const XubString& rStr );
 };
 //for SwInsFootNoteDlg end
@@ -582,5 +582,3 @@ struct SwDialogsResMgr
 };
 
 #endif
-
-
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 440457f0b1..01c8abcbbe 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -432,7 +432,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
 
     aTree.SetHelpId(HID_REGION_TREE);
     aTree.SetSelectionMode( MULTIPLE_SELECTION );
-    aTree.SetWindowBits(WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL);
+    aTree.SetStyle(aTree.GetStyle()|WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL);
     aTree.SetSpaceBetweenEntries(0);
 
     if(bWeb)
diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src
index 81162518c1..5a79079fe7 100644
--- a/sw/source/ui/dochdl/selglos.src
+++ b/sw/source/ui/dochdl/selglos.src
@@ -33,7 +33,7 @@
  // #define DLG_SEL_GLOS 256
 ModalDialog DLG_SEL_GLOS
 {
-    HelpID = FN_EXPAND_GLOSSARY ;
+    HelpID = CMD_FN_EXPAND_GLOSSARY ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 220 , 100 ) ;
@@ -68,6 +68,7 @@ ModalDialog DLG_SEL_GLOS
     };
     ListBox LB_GLOS
     {
+        HelpID = "sw:ListBox:DLG_SEL_GLOS:LB_GLOS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 140 , 74 ) ;
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx
index 6022a4646a..c49c689851 100644
--- a/sw/source/ui/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx
@@ -85,20 +85,13 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
     if ( mrSidebarWin.IsReadOnly() )
     {
         pButtonPopup->EnableItem( FN_REPLY, false );
-        pButtonPopup->EnableItem( FN_DELETE_NOTE, false );
+        pButtonPopup->EnableItem( FN_DELETE_COMMENT, false );
         pButtonPopup->EnableItem( FN_DELETE_NOTE_AUTHOR, false );
         pButtonPopup->EnableItem( FN_DELETE_ALL_NOTES, false );
     }
     else
     {
-        if ( mrSidebarWin.IsProtected() )
-        {
-            pButtonPopup->EnableItem( FN_DELETE_NOTE, false );
-        }
-        else
-        {
-            pButtonPopup->EnableItem( FN_DELETE_NOTE, true );
-        }
+        pButtonPopup->EnableItem( FN_DELETE_COMMENT, !mrSidebarWin.IsProtected() );
         pButtonPopup->EnableItem( FN_DELETE_NOTE_AUTHOR, true );
         pButtonPopup->EnableItem( FN_DELETE_ALL_NOTES, true );
     }
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index 91ea1e13b0..08fb91dcc3 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -208,7 +208,8 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
 {
     //collect our old meta data
     SwSidebarWin* pWin = Mgr().GetNextPostIt(KEY_PAGEUP, this);
-    const LocaleDataWrapper& rLocalData = SvtSysLocale().GetLocaleData();
+    const SvtSysLocale aSysLocale;
+    const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData();
     String aText = String(SW_RES(STR_REPLY));
         SwRewriter aRewriter;
         aRewriter.AddRule(UNDO_ARG1, pWin->GetAuthor());
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 8caf11c84d..8ce45ae318 100755..100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -389,7 +389,8 @@ void SwSidebarWin::InitControls()
 
 void SwSidebarWin::CheckMetaText()
 {
-    const LocaleDataWrapper& rLocalData = SvtSysLocale().GetLocaleData();
+    const SvtSysLocale aSysLocale;
+    const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData();
     String sMeta = GetAuthor();
     if (sMeta.Len() == 0)
     {
@@ -934,7 +935,6 @@ void SwSidebarWin::ExecuteCommand(USHORT nSlot)
             break;
         }
         case FN_DELETE_COMMENT:
-        case FN_DELETE_NOTE:
 
                 //Delete(); // do not kill the parent of our open popup menu
                 mnEventId = Application::PostUserEvent( LINK( this, SwSidebarWin, DeleteHdl), 0 );
diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src
index dcd0f98103..459b673cb1 100644
--- a/sw/source/ui/docvw/docvw.src
+++ b/sw/source/ui/docvw/docvw.src
@@ -36,56 +36,56 @@ Menu MN_READONLY_POPUP
         MenuItem
         {
             Identifier = MN_READONLY_OPENURL ;
-            HelpID = SID_OPENDOC ;
+            HelpId = CMD_SID_OPENDOC ;
             Text [ en-US ] = "~Open" ;
         };
         MenuItem
         {
             Identifier = MN_READONLY_OPENURLNEW ;
-            HelpID = SID_OPENDOC ;
+            HelpId = CMD_SID_OPENDOC ;
             Text [ en-US ] = "Open in New Window" ;
         };
         MenuItem
         {
             Identifier = MN_READONLY_EDITDOC ;
-            HelpID = SID_EDITDOC ;
+            HelpId = CMD_SID_EDITDOC ;
             Text [ en-US ] = "~Edit" ;
         };
         MenuItem
         {
             Identifier = MN_READONLY_SELECTION_MODE ;
-            HelpID = FN_READONLY_SELECTION_MODE ;
+            HelpId = CMD_FN_READONLY_SELECTION_MODE ;
             Text [ en-US ] = "Select Text";
         };
         MenuItem
         {
             Identifier = MN_READONLY_RELOAD;
-            HelpID = SID_RELOAD;
+            HelpId = CMD_SID_RELOAD;
             Text [ en-US ] = "Re~load";
         };
         MenuItem
         {
             Identifier = MN_READONLY_RELOAD_FRAME;
-            HelpID = SID_RELOAD;
+            HelpId = CMD_SID_RELOAD;
             Text [ en-US ] = "Reload Frame";
         };
         MenuItem
         {
             Identifier = MN_READONLY_SOURCEVIEW ;
-            HelpID = HID_SOURCEVIEW ;
+            HelpId = HID_SOURCEVIEW ;
             Text [ en-US ] = "HT~ML Source" ;
         };
         SEPARATOR
         MenuItem
         {
             Identifier = MN_READONLY_BROWSE_BACKWARD ;
-            HelpID = SID_BROWSE_BACKWARD ;
+            HelpId = CMD_SID_BROWSE_BACKWARD ;
             Text [ en-US ] = "Backwards" ;
         };
         MenuItem
         {
             Identifier = MN_READONLY_BROWSE_FORWARD ;
-            HelpID = SID_BROWSE_FORWARD ;
+            HelpId = CMD_SID_BROWSE_FORWARD ;
             Text [ en-US ] = "~Forward" ;
         };
         SEPARATOR
@@ -190,14 +190,14 @@ Menu MN_READONLY_POPUP
         MenuItem
         {
             Identifier = SID_WIN_FULLSCREEN;
-            HelpID =  SID_WIN_FULLSCREEN;
+            HelpId = CMD_SID_WIN_FULLSCREEN;
             Text [ en-US ] = "Leave Full-Screen Mode" ;
         };
         SEPARATOR
         MenuItem
         {
             Identifier = MN_READONLY_COPY ;
-            HelpID = SID_COPY;
+            HelpId = CMD_SID_COPY;
             Text [ en-US ] = "~Copy" ;
         };
     };
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index 8aa6c2e766..f84c74f0a2 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -304,8 +304,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         {
                             USHORT nOldSubType = pFld->GetSubType();
                             ((SwField*)pFld)->SetSubType(nsSwExtendedSubType::SUB_CMD);
-                            sTxt =
-                                pFld->ExpandField(rSh.GetDoc()->IsClipBoard());
+                            sTxt = pFld->ExpandField(true);
                             ((SwField*)pFld)->SetSubType(nOldSubType);
                         }
                         break;
@@ -340,7 +339,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                             break;
 
                         case RES_DBFLD:
-                            sTxt = ((SwDBField*)pFld)->GetCntnt(TRUE);
+                            sTxt = pFld->GetFieldName();
                             break;
 
                         case RES_USERFLD:
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 2ea48e2a7e..be71b1aa38 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -62,6 +62,8 @@
 #ifndef _HELPID_H
 #include <helpid.h>
 #endif
+#include <deque>
+
 
 
 struct SwTextPortion
@@ -75,17 +77,8 @@ struct SwTextPortion
 #define MAX_HIGHLIGHTTIME 200
 #define SYNTAX_HIGHLIGHT_TIMEOUT 200
 
-SV_DECL_VARARR(SwTextPortions, SwTextPortion,16,16)
-
-/* -----------------15.01.97 12.07-------------------
-
---------------------------------------------------*/
+typedef std::deque<SwTextPortion> SwTextPortions;
 
-SV_IMPL_VARARR(SwTextPortions, SwTextPortion)
-
-/*-----------------15.01.97 12.08-------------------
-
---------------------------------------------------*/
 
 static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
 {
@@ -101,11 +94,11 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
 
 
     const USHORT nStrLen = rSource.Len();
-    USHORT nInsert = 0;			// Anzahl der eingefuegten Portions
-    USHORT nActPos = 0;			//Position, an der '<' gefunden wurde
-    USHORT nOffset = 0; 		//Offset von nActPos zur '<'
-    USHORT nPortStart = USHRT_MAX; 	// fuer die TextPortion
-    USHORT nPortEnd  = 	0;  //
+    USHORT nInsert = 0;				// Number of inserted Portions
+    USHORT nActPos = 0;				// Position, at the '<' was found
+    USHORT nOffset = 0; 			// Offset of nActPos for '<'
+    USHORT nPortStart = USHRT_MAX; 	// For the TextPortion
+    USHORT nPortEnd  = 	0;  		//
     SwTextPortion aText;
     while(nActPos < nStrLen)
     {
@@ -122,7 +115,8 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
                     aText.nStart += 1;
                 aText.nEnd = nActPos - 1;
                 aText.eType = svtools::HTMLUNKNOWN;
-                aPortionList.Insert(aText, nInsert++);
+                aPortionList.push_back( aText );
+                nInsert++;
             }
             sal_Unicode cFollowFirst = rSource.GetChar((xub_StrLen)(nActPos + 1));
             sal_Unicode cFollowNext = rSource.GetChar((xub_StrLen)(nActPos + 2));
@@ -212,7 +206,8 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
                     aTextPortion.nStart = nPortStart + 1;
                     aTextPortion.nEnd = nPortEnd;
                     aTextPortion.eType = eFoundType;
-                    aPortionList.Insert(aTextPortion, nInsert++);
+                    aPortionList.push_back( aTextPortion ); 
+                    nInsert++;
                     eFoundType = svtools::HTMLUNKNOWN;
                 }
 
@@ -226,7 +221,8 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
         aText.nStart = nPortEnd + 1;
         aText.nEnd = nActPos - 1;
         aText.eType = svtools::HTMLUNKNOWN;
-        aPortionList.Insert(aText, nInsert++);
+        aPortionList.push_back( aText );
+        nInsert++;
     }
 }
 
@@ -749,7 +745,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
     SwTextPortions aPortionList;
     lcl_Highlight(rSource, aPortionList);
 
-    USHORT nCount = aPortionList.Count();
+    size_t nCount = aPortionList.size();
     if ( !nCount )
         return;
 
@@ -757,7 +753,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
     if ( rLast.nStart > rLast.nEnd ) 	// Nur bis Bug von MD behoeben
     {
         nCount--;
-        aPortionList.Remove( nCount);
+        aPortionList.pop_back();
         if ( !nCount )
             return;
     }
@@ -777,7 +773,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
 #ifdef DBG_UTIL
         USHORT nLine = aPortionList[0].nLine;
 #endif
-        for ( USHORT i = 0; i < nCount; i++ )
+        for ( size_t i = 0; i < nCount; i++ )
         {
             SwTextPortion& r = aPortionList[i];
             DBG_ASSERT( r.nLine == nLine, "doch mehrere Zeilen ?" );
@@ -796,7 +792,7 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
         }
     }
 
-    for ( USHORT i = 0; i < aPortionList.Count(); i++ )
+    for ( size_t i = 0; i < aPortionList.size(); i++ )
     {
         SwTextPortion& r = aPortionList[i];
         if ( r.nStart > r.nEnd ) 	// Nur bis Bug von MD behoeben
diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index 16987430b7..ccca0c6b44 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -57,6 +57,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_ADDR_LEFT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -81,6 +82,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_ADDR_TOP
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -105,6 +107,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_ADDR_EDIT
     {
+        HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT";
         Pos = MAP_APPFONT ( 194 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -132,6 +135,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SEND_LEFT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 78 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -156,6 +160,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SEND_TOP
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 94 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -180,6 +185,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_SEND_EDIT
     {
+        HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT";
         Pos = MAP_APPFONT ( 194 , 77 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Edit" ;
@@ -200,6 +206,7 @@ TabPage TP_ENV_FMT
     };
     ListBox BOX_SIZE_FORMAT
     {
+        HelpID = "sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 120 ) ;
         Size = MAP_APPFONT ( 40 , 72 ) ;
@@ -215,6 +222,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SIZE_WIDTH
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 136 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -239,6 +247,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SIZE_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 152 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index 2c025633b0..8f27ff976d 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -86,6 +86,7 @@ TabPage TP_ENV_ENV
     };
     MultiLineEdit EDT_ADDR
     {
+        HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 124 , 66 ) ;
@@ -103,6 +104,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_DATABASE
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_DATABASE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 17 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -117,6 +119,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_TABLE
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_TABLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 44 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -125,6 +128,7 @@ TabPage TP_ENV_ENV
     };
     ImageButton BTN_INSERT
     {
+        HelpID = "sw:ImageButton:TP_ENV_ENV:BTN_INSERT";
         Pos = MAP_APPFONT ( 137 , 71 ) ;
         Size = MAP_APPFONT ( 18 , 12 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
@@ -138,6 +142,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_DBFIELD
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_DBFIELD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 71 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -146,6 +151,7 @@ TabPage TP_ENV_ENV
     };
     CheckBox BOX_SEND
     {
+        HelpID = "sw:CheckBox:TP_ENV_ENV:BOX_SEND";
         Pos = MAP_APPFONT ( 6 , 105 ) ;
         Size = MAP_APPFONT ( 124 , 8 ) ;
         Text [ en-US ] = "~Sender" ;
@@ -153,6 +159,7 @@ TabPage TP_ENV_ENV
     };
     MultiLineEdit EDT_SEND
     {
+        HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 116) ;
         Size = MAP_APPFONT ( 124 , 63 ) ;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 12b0f1f38f..2c68ee52a6 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -103,9 +103,9 @@ void SwEnvPreview::Paint(const Rectangle &)
     USHORT nPageW = (USHORT) Max(rItem.lWidth, rItem.lHeight),
            nPageH = (USHORT) Min(rItem.lWidth, rItem.lHeight);
 
-    float fx = static_cast< float >(GetOutputSizePixel().Width () / nPageW),
-          fy = static_cast< float >(GetOutputSizePixel().Height() / nPageH),
-          f  = static_cast< float >(0.8 * ( fx < fy ? fx : fy ));
+    float fx = (float)GetOutputSizePixel().Width () / (float)nPageW,
+          fy = (float)GetOutputSizePixel().Height() / (float)nPageH,
+          f  = 0.8f * ( fx < fy ? fx : fy );
 
     Color aBack = rSettings.GetWindowColor( );
     Color aFront = SwViewOption::GetFontColor();
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index 25a92fcda2..6b5801b0cf 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -49,37 +49,38 @@ TabPage TP_ENV_PRT
             ToolBoxItem
             {
                 Identifier = ITM_HOR_LEFT ;
-                HelpID = ITM_HOR_LEFT ;
+                HelpID = HID_ITM_HOR_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_CNTR ;
-                HelpID = ITM_HOR_CNTR ;
+                HelpID = HID_ITM_HOR_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_RGHT ;
-                HelpID = ITM_HOR_RGHT ;
+                HelpID = HID_ITM_HOR_RGHT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_LEFT ;
-                HelpID = ITM_VER_LEFT ;
+                HelpID = HID_ITM_VER_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_CNTR ;
-                HelpID = ITM_VER_CNTR ;
+                HelpID = HID_ITM_VER_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_RGHT ;
-                HelpID = ITM_VER_RGHT ;
+                HelpID = HID_ITM_VER_RGHT ;
             };
         };
     };
     RadioButton BTN_TOP
     {
+        HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_TOP";
         Pos = MAP_APPFONT ( 18 , 42 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text [ en-US ] = "~Print from top" ;
@@ -89,6 +90,7 @@ TabPage TP_ENV_PRT
     };
     RadioButton BTN_BOTTOM
     {
+        HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM";
         Pos = MAP_APPFONT ( 18 , 56 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text [ en-US ] = "Print from ~bottom" ;
@@ -103,6 +105,7 @@ TabPage TP_ENV_PRT
     };
     MetricField FLD_RIGHT
     {
+        HelpID = "sw:MetricField:TP_ENV_PRT:FLD_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 86 , 72 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -127,6 +130,7 @@ TabPage TP_ENV_PRT
     };
     MetricField FLD_DOWN
     {
+        HelpID = "sw:MetricField:TP_ENV_PRT:FLD_DOWN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 86 , 88 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -157,6 +161,7 @@ TabPage TP_ENV_PRT
     };
     PushButton BTN_PRTSETUP
     {
+        HelpID = "sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP";
         Pos = MAP_APPFONT ( 198 , 114 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index f2200a0c44..dbcea27b94 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -110,6 +110,7 @@ TabPage TP_LAB_LAB
     };
     CheckBox BOX_ADDR
     {
+        HelpID = "sw:CheckBox:TP_LAB_LAB:BOX_ADDR";
         Pos = MAP_APPFONT ( 67 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -117,6 +118,7 @@ TabPage TP_LAB_LAB
     };
     MultiLineEdit EDT_WRITING
     {
+        HelpID = "sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 105 , 89 ) ;
@@ -134,6 +136,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_DATABASE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_DATABASE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 27 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -148,6 +151,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_TABLE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_TABLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 56 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -156,6 +160,7 @@ TabPage TP_LAB_LAB
     };
     ImageButton BTN_INSERT
     {
+        HelpID = "sw:ImageButton:TP_LAB_LAB:BTN_INSERT";
         Pos = MAP_APPFONT ( 124 , 92 ) ;
         Size = MAP_APPFONT ( 18 , 12 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
@@ -169,6 +174,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_DBFIELD
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_DBFIELD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 92 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -184,6 +190,7 @@ TabPage TP_LAB_LAB
     };
     RadioButton BTN_CONT
     {
+        HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_CONT";
         Pos = MAP_APPFONT ( 12 , 137 ) ;
         Size = MAP_APPFONT ( 65 , 10 ) ;
         TabStop = TRUE ;
@@ -192,6 +199,7 @@ TabPage TP_LAB_LAB
     };
     RadioButton BTN_SHEET
     {
+        HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_SHEET";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 65 , 10 ) ;
         Text [ en-US ] = "~Sheet" ;
@@ -205,6 +213,7 @@ TabPage TP_LAB_LAB
     };
     ListBox BOX_MAKE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:BOX_MAKE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 136 ) ;
         Size = MAP_APPFONT ( 124 , 90 ) ;
@@ -220,6 +229,7 @@ TabPage TP_LAB_LAB
     };
     ListBox BOX_TYPE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:BOX_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 152 ) ;
         Size = MAP_APPFONT ( 124 , 90 ) ;
@@ -255,6 +265,7 @@ FloatingWindow DLG_SYNC_BTN
     Hide = TRUE ;
     PushButton BTN_SYNC
     {
+        HelpID = "sw:PushButton:DLG_SYNC_BTN:BTN_SYNC";
         Pos = MAP_APPFONT ( 1 , 1 ) ;
         Size = MAP_APPFONT ( WIDTH - 1 , HEIGHT - 1 ) ;
         Text [ en-US ] = "Synchronize Labels" ;
@@ -291,6 +302,7 @@ TabPage TP_VISITING_CARDS
     };
     ListBox LB_AUTO_TEXT_GROUP
     {
+        HelpID = "sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP";
         Pos = MAP_APPFONT ( 12 , 164) ;
         Size = MAP_APPFONT ( 109 , 50 ) ;
         Border = TRUE ;
@@ -332,18 +344,21 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FIRSTNAME
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME";
         Pos = MAP_APPFONT ( 105 , 14 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME";
         Pos = MAP_APPFONT ( 163 , 14 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_SHORTCUT
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT";
         Pos = MAP_APPFONT ( 221 , 14 ) ;
         Size = MAP_APPFONT ( 27 , 12 ) ;
         Border = TRUE ;
@@ -356,18 +371,21 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FIRSTNAME_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2";
         Pos = MAP_APPFONT ( 105 , 30 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_NAME_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME_2";
         Pos = MAP_APPFONT ( 163 , 30 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_SHORTCUT_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2";
         Pos = MAP_APPFONT ( 221 , 30 ) ;
         Size = MAP_APPFONT ( 27 , 12 ) ;
         Border = TRUE ;
@@ -380,6 +398,7 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_STREET
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STREET";
         Pos = MAP_APPFONT ( 105 , 46 ) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -392,12 +411,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_ZIP
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_ZIP";
         Pos = MAP_APPFONT ( 105 , 62 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_CITY
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_CITY";
         Pos = MAP_APPFONT ( 158 , 62 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         Border = TRUE ;
@@ -410,12 +431,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_COUNTRY
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY";
         Pos = MAP_APPFONT ( 105 , 78 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_STATE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STATE";
         Pos = MAP_APPFONT ( 179 , 78 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -428,12 +451,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_TITLE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_TITLE";
         Pos = MAP_APPFONT ( 105 , 94 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_PROFESSION
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION";
         Pos = MAP_APPFONT ( 179 , 94 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -446,12 +471,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_PHONE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PHONE";
         Pos = MAP_APPFONT ( 105 , 110 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MOBILE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MOBILE";
         Pos = MAP_APPFONT ( 179 , 110 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -464,6 +491,7 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FAX
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FAX";
         Pos = MAP_APPFONT ( 105 , 126 ) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -476,12 +504,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_WWW
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_WWW";
         Pos = MAP_APPFONT ( 105 , 142) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MAIL
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MAIL";
         Pos = MAP_APPFONT ( 179 , 142) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -506,6 +536,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COMP
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP";
         Pos = MAP_APPFONT ( 105 , 14) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -518,6 +549,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COMP_EXT
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT";
         Pos = MAP_APPFONT ( 105 , 30) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -530,6 +562,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_SLOGAN
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN";
         Pos = MAP_APPFONT ( 105 , 46) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -542,6 +575,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_STREET
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STREET";
         Pos = MAP_APPFONT ( 105 , 62) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -554,12 +588,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_ZIP
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_ZIP";
         Pos = MAP_APPFONT ( 105 , 78) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_CITY
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_CITY";
         Pos = MAP_APPFONT ( 158 , 78) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         Border = TRUE ;
@@ -572,12 +608,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COUNTRY
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY";
         Pos = MAP_APPFONT ( 105 , 94) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_STATE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STATE";
         Pos = MAP_APPFONT ( 179 , 94) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -590,6 +628,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_POSITION
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_POSITION";
         Pos = MAP_APPFONT ( 105 , 110) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -602,12 +641,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_PHONE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_PHONE";
         Pos = MAP_APPFONT ( 105 , 126) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MOBILE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MOBILE";
         Pos = MAP_APPFONT ( 179 , 126) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -620,6 +661,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_FAX
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_FAX";
         Pos = MAP_APPFONT ( 105 , 142) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -632,12 +674,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_WWW
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_WWW";
         Pos = MAP_APPFONT ( 105 , 158) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MAIL
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MAIL";
         Pos = MAP_APPFONT ( 179 , 158) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 05c2cf90be..a9f6af7ba6 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -724,7 +724,7 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet)
     pExampleFrame(0)
 {
     FreeResource();
-    aAutoTextLB.SetWindowBits( WB_HSCROLL );
+    aAutoTextLB.SetStyle( aAutoTextLB.GetStyle() | WB_HSCROLL );
     aAutoTextLB.SetSpaceBetweenEntries(0);
     aAutoTextLB.SetSelectionMode( SINGLE_SELECTION );
     aAutoTextLB.SetHelpId(HID_BUSINESS_CARD_CONTENT);
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 8d39f44b58..107791b2e8 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -61,6 +61,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_HDIST
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 17 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -81,6 +82,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_VDIST
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_VDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 33 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -101,6 +103,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_WIDTH
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 49 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -121,6 +124,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 65 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_LEFT
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 81 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -163,6 +168,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_UPPER
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_UPPER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 97 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -185,6 +191,7 @@ TabPage TP_LAB_FMT
     };
     NumericField FLD_COLUMNS
     {
+        HelpID = "sw:NumericField:TP_LAB_FMT:FLD_COLUMNS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 113 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -204,6 +211,7 @@ TabPage TP_LAB_FMT
     };
     NumericField FLD_ROWS
     {
+        HelpID = "sw:NumericField:TP_LAB_FMT:FLD_ROWS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 129 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -216,6 +224,7 @@ TabPage TP_LAB_FMT
     };
     PushButton	PB_SAVE
     {
+        HelpID = "sw:PushButton:TP_LAB_FMT:PB_SAVE";
         Pos = MAP_APPFONT ( 50 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Save...";
@@ -270,6 +279,7 @@ ModalDialog DLG_SAVE_LABEL
     };
     ComboBox CB_MAKE
     {
+        HelpID = "sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE";
         Pos = MAP_APPFONT ( 65 , 15 ) ;
         Size = MAP_APPFONT ( 100 , 50 ) ;
         Border = TRUE;
@@ -284,6 +294,7 @@ ModalDialog DLG_SAVE_LABEL
     };
     Edit ED_TYPE
     {
+        HelpID = "sw:Edit:DLG_SAVE_LABEL:ED_TYPE";
         Pos = MAP_APPFONT ( 65 , 30 ) ;
         Size = MAP_APPFONT ( 100 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src
index b6452f56ce..7e1b5c4c58 100644
--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -37,6 +37,7 @@ TabPage TP_LAB_PRT
     Hide = TRUE ;
     RadioButton BTN_PAGE
     {
+        HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_PAGE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -45,6 +46,7 @@ TabPage TP_LAB_PRT
     };
     RadioButton BTN_SINGLE
     {
+        HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_SINGLE";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Single label" ;
@@ -58,6 +60,7 @@ TabPage TP_LAB_PRT
     };
     NumericField FLD_COL
     {
+        HelpID = "sw:NumericField:TP_LAB_PRT:FLD_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 27 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -77,6 +80,7 @@ TabPage TP_LAB_PRT
     };
     NumericField FLD_ROW
     {
+        HelpID = "sw:NumericField:TP_LAB_PRT:FLD_ROW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 224 , 27 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -89,6 +93,7 @@ TabPage TP_LAB_PRT
     };
     CheckBox CB_SYNCHRON
     {
+        HelpID = "sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON";
         Pos = MAP_APPFONT ( 12 , 43 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         TabStop = TRUE ;
@@ -109,6 +114,7 @@ TabPage TP_LAB_PRT
     };
     PushButton BTN_PRTSETUP
     {
+        HelpID = "sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP";
         Pos = MAP_APPFONT ( 198 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index a80438afe8..76595d5543 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -779,7 +779,7 @@ bool SwMailMergeDlg::ExecQryShell()
 
         m_aSelection.realloc(nEnd - nStart + 1);
         Any* pSelection = m_aSelection.getArray();
-        for (sal_Int32 i = nStart; i != nEnd; ++i, ++pSelection)
+        for (sal_Int32 i = nStart; i <= nEnd; ++i, ++pSelection)
             *pSelection <<= i;
     }
     else if (aAllRB.IsChecked() )
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
index f87f08478a..48eedbf3ce 100644
--- a/sw/source/ui/envelp/mailmrge.src
+++ b/sw/source/ui/envelp/mailmrge.src
@@ -41,7 +41,7 @@ ModalDialog DLG_MAILMERGE
     _MAIL_MERGE_STRING_
     Moveable = TRUE ;
     Sizeable = TRUE;
-    HelpID = FN_QRY_MERGE ;
+    HelpID = CMD_FN_QRY_MERGE ;
     Window WIN_BEAMER
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -49,6 +49,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_ALL
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_ALL";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~All" ;
@@ -56,6 +57,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_MARKED
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MARKED";
         Pos = MAP_APPFONT ( 12 , 110 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Selected records" ;
@@ -63,6 +65,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_FROM
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FROM";
         Pos = MAP_APPFONT ( 12 , 123 ) ;
         Size = MAP_APPFONT ( 33 , 10 ) ;
         Text [ en-US ] = "~From:" ;
@@ -70,6 +73,7 @@ ModalDialog DLG_MAILMERGE
     };
     NumericField NF_FROM
     {
+        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 48 , 122 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -87,6 +91,7 @@ ModalDialog DLG_MAILMERGE
     };
     NumericField NF_TO
     {
+        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 105 , 122 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -103,6 +108,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_PRINTER
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_PRINTER";
         Pos = MAP_APPFONT ( 144 , 97 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Check = TRUE ;
@@ -111,6 +117,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_MAILING
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MAILING";
         Pos = MAP_APPFONT ( 200 , 97 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         TabStop = TRUE ;
@@ -118,6 +125,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_FILE
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FILE";
         Pos = MAP_APPFONT ( 256 , 97 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         TabStop = TRUE ;
@@ -125,6 +133,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_SINGLE_JOBS
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS";
         Pos = MAP_APPFONT ( 150 , 112 ) ;
         Size = MAP_APPFONT ( 142 , 10 ) ;
         TabStop = TRUE ;
@@ -138,6 +147,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_SAVE_SINGLE_DOC     
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_SINGLE_DOC";
         Pos = MAP_APPFONT (  150, 139 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -145,6 +155,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_SAVE_INDIVIDUAL     
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_INDIVIDUAL";
         Pos = MAP_APPFONT (  150, 152 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -152,6 +163,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox RB_GENERATE_FROM_DATABASE
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:RB_GENERATE_FROM_DATABASE";
         Pos = MAP_APPFONT (  156, 168 ) ;
         Size = MAP_APPFONT ( 144 , 10 ) ;
         TabStop = TRUE ;
@@ -165,6 +177,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 205 , 182 ) ;
         Size = MAP_APPFONT ( 103 , 84 ) ;
@@ -179,6 +192,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_PATH
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_PATH";
         Pos = MAP_APPFONT ( 205 , 198 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
         Border = TRUE ;
@@ -186,6 +200,7 @@ ModalDialog DLG_MAILMERGE
     };
     PushButton PB_PATH
     {
+        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_PATH";
         Pos = MAP_APPFONT ( 294 , 198 ) ;
         Size = MAP_APPFONT ( 14 , 12 ) ;
          // Soll Groesse des Edits haben (12)!
@@ -200,6 +215,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_FILTER
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_FILTER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 205 , 214 ) ;
         Size = MAP_APPFONT ( 103 , 84 ) ;
@@ -209,6 +225,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_ADDRESSFLD
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 110 ) ;
         Size = MAP_APPFONT ( 74 , 84 ) ;
@@ -226,6 +243,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_SUBJECT
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_SUBJECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 127 ) ;
         Size = MAP_APPFONT ( 88 , 12 ) ;
@@ -241,6 +259,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_ATTACH
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_ATTACH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 140 ) ;
         Size = MAP_APPFONT ( 72 , 12 ) ;
@@ -250,6 +269,7 @@ ModalDialog DLG_MAILMERGE
     };
     PushButton PB_ATTACH
     {
+        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_ATTACH";
         Pos = MAP_APPFONT ( 294 , 140 ) ;
         Size = MAP_APPFONT ( 14 , 12 ) ;
          // Soll Groesse des Edits haben (12)!
@@ -266,6 +286,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_HTML
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML";
         Pos = MAP_APPFONT ( 220 , 156 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -275,6 +296,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_RTF
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF";
         Pos = MAP_APPFONT ( 220 , 169 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -283,6 +305,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_SW
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW";
         Pos = MAP_APPFONT ( 220, 182 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -340,6 +363,7 @@ ModalDialog DLG_MERGE_CREATE
     };
     RadioButton RB_THISDOC
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Check = TRUE;
@@ -348,6 +372,7 @@ ModalDialog DLG_MERGE_CREATE
     };
     RadioButton RB_TEMPLATE
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_TEMPLATE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -387,6 +412,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS
     };
     RadioButton RB_USEEXISTING
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_USEEXISTING";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Check = TRUE;
@@ -395,6 +421,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS
     };
     RadioButton RB_CREATENEW
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_CREATENEW";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index a32e6634b2..823ce5570c 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -32,21 +32,14 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <fldmgr.hxx>
-#ifndef _MSGBOX_HXX
 #include <vcl/msgbox.hxx>
-#endif
 #include <DropDownFieldDialog.hxx>
 #include <flddropdown.hxx>
-#ifndef _FLDUI_HRC
 #include <fldui.hrc>
-#endif
-#ifndef _SW_DROPDOWNFIELDDIALOG_HRC
 #include <DropDownFieldDialog.hrc>
-#endif
 
 using namespace ::com::sun::star;
 
@@ -124,13 +117,12 @@ void sw::DropDownFieldDialog::Apply()
         {
             rSh.StartAllAction();
 
-            SwDropDownField * pCopy = (SwDropDownField *) pDropField->Copy();
+            ::std::auto_ptr<SwDropDownField> const pCopy(
+                static_cast<SwDropDownField *>( pDropField->CopyField() ) );
 
             pCopy->SetPar1(sSelect);
             rSh.SwEditShell::UpdateFlds(*pCopy);
 
-            delete pCopy;
-
             rSh.SetUndoNoResetModified();
             rSh.EndAllAction();
         }
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src
index 25f6c4ac15..2d5c98cfe5 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.src
+++ b/sw/source/ui/fldui/DropDownFieldDialog.src
@@ -45,6 +45,7 @@ ModalDialog DLG_FLD_DROPDOWN
     };
     ListBox LB_LISTITEMS
     {
+        HelpID = "sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 115 , 99 ) ;
@@ -67,6 +68,7 @@ ModalDialog DLG_FLD_DROPDOWN
     };
     PushButton PB_NEXT
     {
+        HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT";
         Pos = MAP_APPFONT ( 139 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -81,6 +83,7 @@ ModalDialog DLG_FLD_DROPDOWN
     };
     PushButton PB_EDIT
     {
+        HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT";
         Pos = MAP_APPFONT ( 139 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index bd35309e68..17759f7a3b 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -115,7 +115,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
     aAddDBPB.SetClickHdl(LINK(this, SwChangeDBDlg, AddDBHdl));
 
     aUsedDBTLB.SetSelectionMode(MULTIPLE_SELECTION);
-    aUsedDBTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+    aUsedDBTLB.SetStyle(aUsedDBTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
     aUsedDBTLB.SetSpaceBetweenEntries(0);
 
     aUsedDBTLB.SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src
index a461a1d7ac..8c4e21d5b3 100644
--- a/sw/source/ui/fldui/changedb.src
+++ b/sw/source/ui/fldui/changedb.src
@@ -31,6 +31,7 @@
 
 ModalDialog DLG_CHANGE_DB
 {
+    HelpID = "sw:ModalDialog:DLG_CHANGE_DB";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 286 , 175 ) ;
@@ -74,6 +75,7 @@ ModalDialog DLG_CHANGE_DB
     };
     PushButton PB_ADDDB
     {
+        HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB";
         Pos = MAP_APPFONT ( 118 ,  90  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Browse..." ;
diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index e7bc8b99f9..d88d8790ba 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_DB
     };
     ListBox LB_DBTYPE
     {
+        HelpID = "sw:ListBox:TP_FLD_DB:LB_DBTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 104 ) ;
@@ -67,6 +68,7 @@ TabPage TP_FLD_DB
     };
     Edit ED_DBCONDITION
     {
+        HelpID = "sw:Edit:TP_FLD_DB:ED_DBCONDITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 137 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -82,6 +84,7 @@ TabPage TP_FLD_DB
     };
     Edit ED_DBSETNUMBER
     {
+        HelpID = "sw:Edit:TP_FLD_DB:ED_DBSETNUMBER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 167 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -110,6 +113,7 @@ TabPage TP_FLD_DB
     };
     PushButton PB_ADDDB
     {
+        HelpID = "sw:PushButton:TP_FLD_DB:PB_ADDDB";
         Pos = MAP_APPFONT ( 198 , 121) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Browse..." ;
@@ -117,6 +121,7 @@ TabPage TP_FLD_DB
 
     RadioButton RB_DBOWNFORMAT
     {
+        HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT";
         Pos = MAP_APPFONT ( 94 , 153 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Check = TRUE ;
@@ -124,12 +129,14 @@ TabPage TP_FLD_DB
     };
     RadioButton RB_DBFORMAT
     {
+        HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBFORMAT";
         Pos = MAP_APPFONT ( 94 , 166 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "User-defined" ;
     };
     ListBox LB_DBNUMFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 195 , 164 ) ;
         Size = MAP_APPFONT ( 53 , 60 ) ;
@@ -139,6 +146,7 @@ TabPage TP_FLD_DB
     };
     ListBox LB_DBFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_DB:LB_DBFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 195 , 163 ) ;
         Size = MAP_APPFONT ( 53 , 60 ) ;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index dabb6b91e5..9243037bb2 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -89,7 +89,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) :
 
     aTypeTLB.SetHelpId(HID_FIELD_DINF_TYPE);
     aTypeTLB.SetSelectionMode(SINGLE_SELECTION);
-    aTypeTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+    aTypeTLB.SetStyle(aTypeTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
     // Font nicht setzen, damit der Font des Controls uebernommen wird!
     // Sonst bei falschem Font Bug an OV.
     aTypeTLB.SetSpaceBetweenEntries(0);
diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src
index 9f65b88fa3..8f68883456 100644
--- a/sw/source/ui/fldui/flddinf.src
+++ b/sw/source/ui/fldui/flddinf.src
@@ -57,6 +57,7 @@ TabPage TP_FLD_DOKINF
     };
     ListBox LB_DOKINFSELECTION
     {
+        HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 16 ) ;
         Size = MAP_APPFONT ( 76 , 163 ) ;
@@ -78,6 +79,7 @@ TabPage TP_FLD_DOKINF
     };
     ListBox LB_DOKINFFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 16 ) ;
         Size = MAP_APPFONT ( 84 , 148 ) ;
@@ -86,6 +88,7 @@ TabPage TP_FLD_DOKINF
     };
     CheckBox CB_DOKINFFIXEDCONTENT
     {
+        HelpID = "sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT";
         Pos = MAP_APPFONT ( 170 , 170 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src
index 6a60f8b53f..4723a55425 100644
--- a/sw/source/ui/fldui/flddok.src
+++ b/sw/source/ui/fldui/flddok.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_DOK
     };
     ListBox LB_DOKTYPE
     {
+        HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -59,6 +60,7 @@ TabPage TP_FLD_DOK
     };
     ListBox LB_DOKSELECTION
     {
+        HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 15 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -73,6 +75,7 @@ TabPage TP_FLD_DOK
     };
     ListBox LB_DOKFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 151 ) ;
@@ -83,6 +86,7 @@ TabPage TP_FLD_DOK
     };
     ListBox LB_DOKNUMFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 151 ) ;
@@ -100,6 +104,7 @@ TabPage TP_FLD_DOK
     };
     Edit ED_DOKVALUE
     {
+        HelpID = "sw:Edit:TP_FLD_DOK:ED_DOKVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 167 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -109,6 +114,7 @@ TabPage TP_FLD_DOK
     };
     NumericField ED_DOKLEVEL
     {
+        HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 167 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -125,6 +131,7 @@ TabPage TP_FLD_DOK
     };
     NumericField ED_DOKDATEOFF
     {
+        HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 167 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -138,6 +145,7 @@ TabPage TP_FLD_DOK
     };
     CheckBox CB_DOKFIXEDCONTENT
     {
+        HelpID = "sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT";
         Pos = MAP_APPFONT ( 170 , 170 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 76f0fbcfc7..832dabf344 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -195,21 +195,21 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
 {
     // TabPage erzeugen
     SfxTabPage* pTabPage = 0;
-    USHORT nHelpId = 0;
+    const char* pHelpId = 0;
 
     switch (nGroup)
     {
         case GRP_DOC:
             pTabPage = SwFldDokPage::Create(this, *(SfxItemSet*)0);
-            nHelpId = HID_EDIT_FLD_DOK;
+            pHelpId = HID_EDIT_FLD_DOK;
             break;
         case GRP_FKT:
             pTabPage = SwFldFuncPage::Create(this, *(SfxItemSet*)0);
-            nHelpId = HID_EDIT_FLD_FUNC;
+            pHelpId = HID_EDIT_FLD_FUNC;
             break;
         case GRP_REF:
             pTabPage = SwFldRefPage::Create(this, *(SfxItemSet*)0);
-            nHelpId = HID_EDIT_FLD_REF;
+            pHelpId = HID_EDIT_FLD_REF;
             break;
         case GRP_REG:
             {
@@ -233,21 +233,22 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
 //                }
                 pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
                 pTabPage = SwFldDokInfPage::Create(this, *pSet);
-                nHelpId = HID_EDIT_FLD_DOKINF;
+                pHelpId = HID_EDIT_FLD_DOKINF;
                 break;
             }
         case GRP_DB:
             pTabPage = SwFldDBPage::Create(this, *(SfxItemSet*)0);
             static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh);
-            nHelpId = HID_EDIT_FLD_DB;
+            pHelpId = HID_EDIT_FLD_DB;
             break;
         case GRP_VAR:
             pTabPage = SwFldVarPage::Create(this, *(SfxItemSet*)0);
-            nHelpId = HID_EDIT_FLD_VAR;
+            pHelpId = HID_EDIT_FLD_VAR;
             break;
 
     }
-    pTabPage->SetHelpId(nHelpId);
+
+    pTabPage->SetHelpId(pHelpId);
     static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh);
 
     SetTabPage(pTabPage);
diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src
index ca67c448fb..aa5e42b078 100644
--- a/sw/source/ui/fldui/fldfunc.src
+++ b/sw/source/ui/fldui/fldfunc.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_FUNC
     };
     ListBox LB_FUNCTYPE
     {
+        HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -60,6 +61,7 @@ TabPage TP_FLD_FUNC
     };
     ListBox LB_FUNCSELECTION
     {
+        HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -77,6 +79,7 @@ TabPage TP_FLD_FUNC
     };
     ListBox LB_FUNCFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -91,6 +94,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_FUNCNAME
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -106,6 +110,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_FUNCVALUE
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 41 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -122,6 +127,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_FUNCCOND1
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 41 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -139,6 +145,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_FUNCCOND2
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 68 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -148,6 +155,7 @@ TabPage TP_FLD_FUNC
     };
     PushButton BT_FUNCMACRO
     {
+        HelpID = "sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO";
         Pos = MAP_APPFONT ( 204 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Macro..." ;
@@ -163,6 +171,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_LISTITEM
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTITEM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -172,6 +181,7 @@ TabPage TP_FLD_FUNC
     };
     PushButton PB_LISTADD
     {
+        HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTADD";
         Pos = MAP_APPFONT ( 170 , 29 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Hide = TRUE;
@@ -186,6 +196,7 @@ TabPage TP_FLD_FUNC
     };
     ListBox LB_LISTITEMS
     {
+        HelpID = "sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 57 ) ;
         Size = MAP_APPFONT ( 83 , 44 ) ;
@@ -195,6 +206,7 @@ TabPage TP_FLD_FUNC
     };
     PushButton PB_LISTREMOVE
     {
+        HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE";
         Pos = MAP_APPFONT ( 203 , 104 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Hide = TRUE;
@@ -202,6 +214,7 @@ TabPage TP_FLD_FUNC
     };
     PushButton PB_LISTUP
     {
+        HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTUP";
         Pos = MAP_APPFONT ( 203 , 121 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Hide = TRUE;
@@ -209,6 +222,7 @@ TabPage TP_FLD_FUNC
     };
     PushButton PB_LISTDOWN
     {
+        HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN";
         Pos = MAP_APPFONT ( 203 , 138 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Hide = TRUE;
@@ -223,6 +237,7 @@ TabPage TP_FLD_FUNC
     };
     Edit ED_LISTNAME
     {
+        HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 167 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 10ee25b477..5b7b70b5f9 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -124,7 +124,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     // --> OD 2007-11-21 #i83479#
     aSelectionToolTipLB.SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) );
     aSelectionToolTipLB.SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) );
-    aSelectionToolTipLB.SetWindowBits( aSelectionToolTipLB.GetWindowBits() | WB_HSCROLL );
+    aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL );
     aSelectionToolTipLB.SetSpaceBetweenEntries(1);
     aSelectionToolTipLB.SetHighlightRange();
     // <--
diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src
index 8abf02e980..c3aa0f737e 100644
--- a/sw/source/ui/fldui/fldref.src
+++ b/sw/source/ui/fldui/fldref.src
@@ -43,6 +43,7 @@ TabPage TP_FLD_REF
     };
     ListBox LB_REFTYPE
     {
+        HelpID = "sw:ListBox:TP_FLD_REF:LB_REFTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 165 ) ;
@@ -58,6 +59,7 @@ TabPage TP_FLD_REF
     };
     ListBox LB_REFSELECTION
     {
+        HelpID = "sw:ListBox:TP_FLD_REF:LB_REFSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
         Size = MAP_APPFONT ( 166 , 73 ) ;
@@ -82,6 +84,7 @@ TabPage TP_FLD_REF
     };
     ListBox LB_REFFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_REF:LB_REFFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 104 ) ;
         Size = MAP_APPFONT ( 76 , 75 ) ;
@@ -98,6 +101,7 @@ TabPage TP_FLD_REF
     };
     Edit ED_REFNAME
     {
+        HelpID = "sw:Edit:TP_FLD_REF:ED_REFNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 104 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -114,6 +118,7 @@ TabPage TP_FLD_REF
     };
     Edit ED_REFVALUE
     {
+        HelpID = "sw:Edit:TP_FLD_REF:ED_REFVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 136 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src
index eda28b7fb4..4c42c971d2 100644
--- a/sw/source/ui/fldui/fldvar.src
+++ b/sw/source/ui/fldui/fldvar.src
@@ -44,6 +44,7 @@ TabPage TP_FLD_VAR
     };
     ListBox LB_VARTYPE
     {
+        HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 135 ) ;
@@ -60,6 +61,7 @@ TabPage TP_FLD_VAR
     };
     ListBox LB_VARSELECTION
     {
+        HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 14 ) ;
         Size = MAP_APPFONT ( 76 , 135 ) ;
@@ -75,6 +77,7 @@ TabPage TP_FLD_VAR
     };
     ListBox LB_VARFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 123 ) ;
@@ -83,6 +86,7 @@ TabPage TP_FLD_VAR
     };
     ListBox LB_VARNUMFORMAT
     {
+        HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 123 ) ;
@@ -91,6 +95,7 @@ TabPage TP_FLD_VAR
     };
     CheckBox CB_VARINVISIBLE
     {
+        HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE";
         Pos = MAP_APPFONT ( 170 , 141 ) ;
         Size = MAP_APPFONT ( 84 , 10 ) ;
         Text [ en-US ] = "Invisi~ble" ;
@@ -112,6 +117,7 @@ TabPage TP_FLD_VAR
     };
     ListBox LB_VARCHAPTERLEVEL
     {
+        HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL";
         Border = TRUE ;
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 208 , 123 ) ;
@@ -132,6 +138,7 @@ TabPage TP_FLD_VAR
     };
     Edit ED_VARSEPARATOR
     {
+        HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR";
         Pos = MAP_APPFONT ( 208 , 138 ) ;
         Size = MAP_APPFONT ( 46 , 12 ) ;
         Border = TRUE ;
@@ -148,6 +155,7 @@ TabPage TP_FLD_VAR
     };
     Edit ED_VARNAME
     {
+        HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 166 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -163,6 +171,7 @@ TabPage TP_FLD_VAR
     };
     Edit ED_VARVALUE
     {
+        HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 166 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 002b312af8..a197147021 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -32,13 +32,7 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-
-#define _INPDLG_CXX
-
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <unotools/charclass.hxx>
 #include <editeng/unolingu.hxx>
 #include <wrtsh.hxx>
@@ -48,12 +42,8 @@
 #include <inpdlg.hxx>
 #include <fldmgr.hxx>
 
-#ifndef _FLDUI_HRC
 #include <fldui.hrc>
-#endif
-#ifndef _INPDLG_HRC
 #include <inpdlg.hrc>
-#endif
 
 
 /*--------------------------------------------------------------------
@@ -128,7 +118,9 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
         //values are formatted - formulas are not
         CharClass aCC( SvxCreateLocale( pSetFld->GetLanguage() ));
         if( aCC.isNumeric( sFormula ))
-            aStr = pSetFld->Expand();
+        {
+            aStr = pSetFld->ExpandField(true);
+        }
         else
             aStr = sFormula;
         aLabelED.SetText( pSetFld->GetPromptText() );
diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src
index f615b68f48..8cd70d8247 100644
--- a/sw/source/ui/fldui/inpdlg.src
+++ b/sw/source/ui/fldui/inpdlg.src
@@ -46,6 +46,7 @@ ModalDialog DLG_FLD_INPUT
     };*/
     Edit ED_LABEL
     {
+        HelpID = "sw:Edit:DLG_FLD_INPUT:ED_LABEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 115 , 12 ) ;
@@ -56,6 +57,7 @@ ModalDialog DLG_FLD_INPUT
     };
     MultiLineEdit ED_EDIT
     {
+        HelpID = "sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 32 ) ;
         Size = MAP_APPFONT ( 115 , 72 ) ;
@@ -83,6 +85,7 @@ ModalDialog DLG_FLD_INPUT
     };
     PushButton PB_NEXT
     {
+        HelpID = "sw:PushButton:DLG_FLD_INPUT:PB_NEXT";
         Pos = MAP_APPFONT ( 139 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src
index ffeb2b84e8..cbcc83f055 100644
--- a/sw/source/ui/fldui/javaedit.src
+++ b/sw/source/ui/fldui/javaedit.src
@@ -33,6 +33,7 @@
  // RID_SVXDLG_POSTIT -----------------------------------------------------
 ModalDialog DLG_JAVAEDIT
 {
+    HelpID = "sw:ModalDialog:DLG_JAVAEDIT";
     OutputSize = TRUE ;
     SvLook = TRUE ;
     Size = MAP_APPFONT ( 248 , 157 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_JAVAEDIT
     };
     Edit ED_TYPE
     {
+        HelpID = "sw:Edit:DLG_JAVAEDIT:ED_TYPE";
         Border = TRUE ;
         Text = "JavaScript" ;
          // Nicht uebersetzen!!!
@@ -54,6 +56,7 @@ ModalDialog DLG_JAVAEDIT
     };
     RadioButton RB_URL
     {
+        HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_URL";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 55 , 10 ) ;
         TabStop = TRUE ;
@@ -61,6 +64,7 @@ ModalDialog DLG_JAVAEDIT
     };
     Edit ED_URL
     {
+        HelpID = "sw:Edit:DLG_JAVAEDIT:ED_URL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 70 , 27 ) ;
         Size = MAP_APPFONT ( 87 , 12 ) ;
@@ -68,6 +72,7 @@ ModalDialog DLG_JAVAEDIT
     };
     PushButton PB_URL
     {
+        HelpID = "sw:PushButton:DLG_JAVAEDIT:PB_URL";
         Pos = MAP_APPFONT ( 163 , 26 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -75,6 +80,7 @@ ModalDialog DLG_JAVAEDIT
     };
     RadioButton RB_EDIT
     {
+        HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_EDIT";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 140 , 10 ) ;
         Text [ en-US ] = "~Text" ;
@@ -83,6 +89,7 @@ ModalDialog DLG_JAVAEDIT
     };
     MultiLineEdit ED_EDIT
     {
+        HelpID = "sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 23 , 54 ) ;
         Size = MAP_APPFONT ( 155 , 91 ) ;
@@ -116,12 +123,14 @@ ModalDialog DLG_JAVAEDIT
     };
     ImageButton BTN_PREV
     {
+        HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_PREV";
         Pos = MAP_APPFONT ( 191 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_LEFT ;
     };
     ImageButton BTN_NEXT
     {
+        HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT";
         Pos = MAP_APPFONT ( 217 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_RIGHT ;
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 449fbbf121..537cf1ce9c 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -46,6 +46,7 @@ TabPage TP_COLUMN
     };
     NumericField ED_NUMBER
     {
+        HelpID = "sw:NumericField:TP_COLUMN:ED_NUMBER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -68,6 +69,7 @@ TabPage TP_COLUMN
     };
     CheckBox CB_BALANCECOLS
     {
+        HelpID = "sw:CheckBox:TP_COLUMN:CB_BALANCECOLS";
         Pos = MAP_APPFONT ( 7 , 46 ) ;
         Size = MAP_APPFONT ( 163 , 10 ) ;
         Hide = TRUE;
@@ -93,6 +95,7 @@ TabPage TP_COLUMN
     };
     ImageButton BTN_DOWN
     {
+        HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 62 , 69 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -122,6 +125,7 @@ TabPage TP_COLUMN
     };
     ImageButton BTN_UP
     {
+        HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 238 , 69 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -137,6 +141,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_1
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_1";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 87 , 83 ) ;
@@ -155,6 +160,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_2
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_2";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 83 ) ;
@@ -173,6 +179,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_3
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_3";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 187 , 83 ) ;
@@ -198,6 +205,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_DIST1
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_DIST1";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 112 , 99 ) ;
@@ -216,6 +224,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_DIST2
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_DIST2";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 99 ) ;
@@ -234,6 +243,7 @@ TabPage TP_COLUMN
     };
     CheckBox CB_AUTO_WIDTH
     {
+        HelpID = "sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH";
         Pos = MAP_APPFONT ( 87 , 115 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "Auto~Width" ;
@@ -255,6 +265,7 @@ TabPage TP_COLUMN
     };
     ListBox LB_STYLE
     {
+        HelpID = "sw:ListBox:TP_COLUMN:LB_STYLE";
         Pos = MAP_APPFONT ( 50 , 138 ) ;
         Size = MAP_APPFONT ( 60 , 66 ) ;
         TabStop = TRUE ;
@@ -273,6 +284,7 @@ TabPage TP_COLUMN
     };
     MetricField ED_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_COLUMN:ED_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 154 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -297,6 +309,7 @@ TabPage TP_COLUMN
     };
     ListBox LB_POSITION
     {
+        HelpID = "sw:ListBox:TP_COLUMN:LB_POSITION";
         Pos = MAP_APPFONT ( 50 , 170 ) ;
         Size = MAP_APPFONT ( 60 , 40 ) ;
         TabStop = TRUE ;
@@ -337,6 +350,7 @@ TabPage TP_COLUMN
     };
     ListBox     LB_TEXTDIRECTION
     {
+        HelpID = "sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 127 , 149 ) ;
         Size = MAP_APPFONT ( 127 , 50 ) ;
@@ -385,6 +399,7 @@ ModalDialog DLG_COLUMN
     };
     ListBox LB_APPLY_TO
     {
+        HelpID = "sw:ListBox:DLG_COLUMN:LB_APPLY_TO";
         Pos = MAP_APPFONT ( 260 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 66 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
index da651a4573..30be09080a 100644
--- a/sw/source/ui/frmdlg/cption.src
+++ b/sw/source/ui/frmdlg/cption.src
@@ -61,6 +61,7 @@ ModalDialog DLG_CAPTION
     };
     PushButton BTN_AUTOCAPTION
     {
+        HelpID = "sw:PushButton:DLG_CAPTION:BTN_AUTOCAPTION";
         Pos = MAP_APPFONT ( 194 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -68,6 +69,7 @@ ModalDialog DLG_CAPTION
     };
     PushButton BTN_OPTION
     {
+        HelpID = "sw:PushButton:DLG_CAPTION:BTN_OPTION";
         Pos = MAP_APPFONT ( 194 , 80 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -83,6 +85,7 @@ ModalDialog DLG_CAPTION
     };
     Edit EDT_TEXT
     {
+        HelpID = "sw:Edit:DLG_CAPTION:EDT_TEXT";
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 182 , 12 ) ;
         Border = TRUE ;
@@ -104,6 +107,7 @@ ModalDialog DLG_CAPTION
     };
     ComboBox BOX_CATEGORY
     {
+        HelpID = "sw:ComboBox:DLG_CAPTION:BOX_CATEGORY";
         Pos = MAP_APPFONT ( 82 , 46 ) ;
         Size = MAP_APPFONT ( 106 , 61 ) ;
         DropDown = TRUE ;
@@ -119,6 +123,7 @@ ModalDialog DLG_CAPTION
     };
     ListBox BOX_FORMAT
     {
+        HelpID = "sw:ListBox:DLG_CAPTION:BOX_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 63 ) ;
         Size = MAP_APPFONT ( 106 , 83 ) ;
@@ -135,6 +140,7 @@ ModalDialog DLG_CAPTION
     };
     Edit ED_NUM_SEP
     {
+        HelpID = "sw:Edit:DLG_CAPTION:ED_NUM_SEP";
         Pos = MAP_APPFONT ( 82 , 63 ) ;
         Size = MAP_APPFONT ( 106 , 12 ) ;
         Border = TRUE ;
@@ -152,6 +158,7 @@ ModalDialog DLG_CAPTION
     };
     Edit EDT_SEP
     {
+        HelpID = "sw:Edit:DLG_CAPTION:EDT_SEP";
         Pos = MAP_APPFONT ( 82 , 80 ) ;
         Size = MAP_APPFONT ( 106 , 12 ) ;
         Border = TRUE ;
@@ -168,6 +175,7 @@ ModalDialog DLG_CAPTION
     };
     ListBox BOX_POS
     {
+        HelpID = "sw:ListBox:DLG_CAPTION:BOX_POS";
         Pos = MAP_APPFONT ( 82 , 97 ) ;
         Size = MAP_APPFONT ( 106 , 61 ) ;
         DropDown = TRUE ;
@@ -244,6 +252,7 @@ ModalDialog DLG_SEQUENCE_OPTION
     };
     ListBox LB_LEVEL
     {
+        HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 18 ) ;
         Size = MAP_APPFONT ( 72 , 60 ) ;
@@ -262,6 +271,7 @@ ModalDialog DLG_SEQUENCE_OPTION
     };
     Edit ED_SEPARATOR
     {
+        HelpID = "sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR";
         Pos = MAP_APPFONT ( 65 , 34 ) ;
         Size = MAP_APPFONT ( 72 , 12 ) ;
         Border = TRUE ;
@@ -282,6 +292,7 @@ ModalDialog DLG_SEQUENCE_OPTION
     };
     ListBox LB_CHARSTYLE
     {
+        HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 68 ) ;
         Size = MAP_APPFONT ( 72 , 60 ) ;
@@ -294,6 +305,7 @@ ModalDialog DLG_SEQUENCE_OPTION
     };
     CheckBox CB_APPLYBAS
     {
+        HelpID = "sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 136 , 10 ) ;
         TabStop = TRUE ;
@@ -313,6 +325,7 @@ ModalDialog DLG_SEQUENCE_OPTION
     };
     ListBox LB_ORDER
     {
+        HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_ORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 114 ) ;
         Size = MAP_APPFONT ( 72 , 60 ) ;
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 413845f1eb..52280136a8 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -93,7 +93,8 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
         aTmp += *pStr;
         aTmp += ')';
     }
-    AddTabPage(TP_FRM_STD,	SwFrmPage::Create, 0);
+    
+    AddTabPage(TP_FRM_STD,  SwFrmPage::Create, 0);
     AddTabPage(TP_FRM_ADD,	SwFrmAddPage::Create, 0);
     AddTabPage(TP_FRM_WRAP,	SwWrapTabPage::Create, 0);
     AddTabPage(TP_FRM_URL,	SwFrmURLPage::Create, 0);
@@ -217,3 +218,4 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
         break;
     }
 }
+
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 7939957c71..50e9754450 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -677,7 +677,10 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     nOldV(text::VertOrientation::TOP),
     nOldVRel(text::RelOrientation::PRINT_AREA),
     pVMap( 0 ),
-    pHMap( 0 )
+    pHMap( 0 ),
+    m_bAllowVertPositioning( true ),
+    m_bIsMathOLE( false ),
+    m_bIsMathBaselineAlignment( true )
 {
     FreeResource();
     SetExchangeSupport();
@@ -782,9 +785,17 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
     SetMetric( aAtHorzPosED, aMetric );
     SetMetric( aAtVertPosED, aMetric );
 
+    const SfxPoolItem* pItem = NULL;
 
     const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR);
 
+    if (SFX_ITEM_SET == rSet.GetItemState(FN_OLE_IS_MATH, FALSE, &pItem))
+        m_bIsMathOLE = ((const SfxBoolItem*)pItem)->GetValue();
+    if (SFX_ITEM_SET == rSet.GetItemState(FN_MATH_BASELINE_ALIGNMENT, FALSE, &pItem))
+        m_bIsMathBaselineAlignment = ((const SfxBoolItem*)pItem)->GetValue();
+    EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment 
+            && FLY_AS_CHAR == rAnchor.GetAnchorId()) );
+
     if (bFormat)
     {
         // Bei Formaten keine Ankerbearbeitung
@@ -812,7 +823,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
     if ( nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE )
     {
         ASSERT(pSh , "shell not found");
-        const SfxPoolItem* pItem;
         //OS: nur fuer die Variante Einfuegen/Grafik/Eigenschaften
         if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_GRF_REALSIZE, FALSE, &pItem))
             aGrfSize = ((const SvxSizeItem*)pItem)->GetSize();
@@ -1080,7 +1090,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
                             aWidthED .GetValue() == aWidthED .GetMin() &&
                             aHeightED.GetValue() == aHeightED.GetMin());
 
-    if ((bNew && !bFormat) || (bValueModified || bCheckChanged) && bLegalValue)
+    if ((bNew && !bFormat) || ((bValueModified || bCheckChanged) && bLegalValue))
     {
         sal_Int64 nNewWidth  = aWidthED.DenormalizePercent(aWidthED.GetRealValue(FUNIT_TWIP));
         sal_Int64 nNewHeight = aHeightED.DenormalizePercent(aHeightED.GetRealValue(FUNIT_TWIP));
@@ -1280,8 +1290,8 @@ void SwFrmPage::InitPos(RndStdIds eId,
         if ( nY != LONG_MAX )
             aAtVertPosED.SetValue( aAtVertPosED.Normalize(nY), FUNIT_TWIP );
     }
-    aAtVertPosFT.Enable( bEnable );
-    aAtVertPosED.Enable( bEnable );
+    aAtVertPosFT.Enable( bEnable && m_bAllowVertPositioning );
+    aAtVertPosED.Enable( bEnable && m_bAllowVertPositioning );
     UpdateExample();
 }
 
@@ -1488,8 +1498,10 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
         }
     }
 
-    _rLB.Enable(_rLB.GetEntryCount() != 0);
-    _rFT.Enable(_rLB.GetEntryCount() != 0);
+    const bool bEnable = _rLB.GetEntryCount() != 0
+            && (&_rLB != &aVertRelationLB || m_bAllowVertPositioning);
+    _rLB.Enable( bEnable );
+    _rFT.Enable( bEnable );
 
     RelHdl(&_rLB);
 
@@ -1850,6 +1862,10 @@ IMPL_LINK( SwFrmPage, AnchorTypeHdl, RadioButton *, EMPTYARG )
         PosHdl(&aHorizontalDLB);
         PosHdl(&aVerticalDLB);
     }
+
+    EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment 
+            && FLY_AS_CHAR == eId) );
+
     return 0;
 }
 
@@ -1875,7 +1891,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
     }
     else
     {
-        BOOL bEnable = text::VertOrientation::NONE == nAlign;
+        BOOL bEnable = text::VertOrientation::NONE == nAlign && m_bAllowVertPositioning;
         aAtVertPosED.Enable( bEnable );
         aAtVertPosFT.Enable( bEnable );
     }
@@ -2304,6 +2320,19 @@ void SwFrmPage::SetFormatUsed(BOOL bFmt)
     }
 }
 
+
+void SwFrmPage::EnableVerticalPositioning( bool bEnable )
+{
+    m_bAllowVertPositioning = bEnable;
+    aVerticalFT.Enable( bEnable );
+    aVerticalDLB.Enable( bEnable );
+    aAtVertPosFT.Enable( bEnable );
+    aAtVertPosED.Enable( bEnable );
+    aVertRelationFT.Enable( bEnable );
+    aVertRelationLB.Enable( bEnable );
+}
+
+
 /*--------------------------------------------------------------------
     Beschreibung:
  --------------------------------------------------------------------*/
@@ -3246,4 +3275,3 @@ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox)
     }
     return 0;
 }
-
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 5ce84d4552..f832061dc7 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -243,6 +243,7 @@ TabPage TP_FRM_STD
     };
     MetricField ED_WIDTH
     {
+        HelpID = "sw:MetricField:TP_FRM_STD:ED_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( SWFRMPG_COL_3 , SWFRMPG_ROW_1 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_3) , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -261,6 +262,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_REL_WIDTH
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_3 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -268,6 +270,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_AUTOWIDTH
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_4 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -289,6 +292,7 @@ TabPage TP_FRM_STD
     };
     MetricField ED_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_FRM_STD:ED_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( SWFRMPG_COL_3 , SWFRMPG_ROW_5 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_3) , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -306,6 +310,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_REL_HEIGHT
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_7 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -313,6 +318,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_AUTOHEIGHT
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_8 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -320,6 +326,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_FIXEDRATIO
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO";
         Pos = MAP_APPFONT ( SWFRMPG_COL_1 , SWFRMPG_ROW_9 ) ;
         Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_1) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -327,6 +334,7 @@ TabPage TP_FRM_STD
     };
     PushButton BT_REALSIZE
     {
+        HelpID = "sw:PushButton:TP_FRM_STD:BT_REALSIZE";
         Pos = MAP_APPFONT ( 35 , 86 ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -347,30 +355,35 @@ TabPage TP_FRM_STD
     };
     RadioButton RB_ANCHOR_PAGE
     {
+        HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE";
         Pos = MAP_APPFONT ( 122 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To ~page";
     };
     RadioButton RB_ANCHOR_PARA
     {
+        HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA";
         Pos = MAP_APPFONT ( 122 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To paragrap~h";
     };
     RadioButton RB_ANCHOR_AT_CHAR
     {
+        HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR";
         Pos = MAP_APPFONT ( 122 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To cha~racter";
     };
     RadioButton RB_ANCHOR_AS_CHAR
     {
+        HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR";
         Pos = MAP_APPFONT ( 122 , 56 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~As character" ;
     };
     RadioButton RB_ANCHOR_FRAME
     {
+        HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_FRAME";
         Pos = MAP_APPFONT ( 122 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To ~frame";
@@ -395,6 +408,7 @@ TabPage TP_FRM_STD
     };
     ListBox DLB_HORIZONTAL
     {
+        HelpID = "sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL";
         Pos = MAP_APPFONT ( 49 , SWFRMPG_ROW_11 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -409,6 +423,7 @@ TabPage TP_FRM_STD
     };
     MetricField ED_AT_HORZ_POS
     {
+        HelpID = "sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , SWFRMPG_ROW_11 ) ;
         Size = MAP_APPFONT ( 35 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -433,6 +448,7 @@ TabPage TP_FRM_STD
     };
     ListBox LB_HORI_RELATION
     {
+        HelpID = "sw:ListBox:TP_FRM_STD:LB_HORI_RELATION";
         Pos = MAP_APPFONT ( 183 , SWFRMPG_ROW_11 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -440,6 +456,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_MIRROR
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_MIRROR";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_13 ) ;
         Size = MAP_APPFONT ( (260-SWFRMPG_COL_2-1) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -454,6 +471,7 @@ TabPage TP_FRM_STD
     };
     ListBox DLB_VERTICAL
     {
+        HelpID = "sw:ListBox:TP_FRM_STD:DLB_VERTICAL";
         Pos = MAP_APPFONT ( 49 , SWFRMPG_ROW_14 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -468,6 +486,7 @@ TabPage TP_FRM_STD
     };
     MetricField ED_AT_VERT_POS
     {
+        HelpID = "sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , SWFRMPG_ROW_14 ) ;
         Size = MAP_APPFONT ( 35 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -492,6 +511,7 @@ TabPage TP_FRM_STD
     };
     ListBox LB_VERT_RELATION
     {
+        HelpID = "sw:ListBox:TP_FRM_STD:LB_VERT_RELATION";
         Pos = MAP_APPFONT ( 183 , SWFRMPG_ROW_14 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -499,6 +519,7 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_FOLLOWTEXTFLOW
     {
+        HelpID = "sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW";
         Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_16 ) ;
         Size = MAP_APPFONT ( (260-SWFRMPG_COL_2-1) , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -540,6 +561,7 @@ TabPage TP_GRF_EXT
     };
     Edit ED_CONNECT
     {
+        HelpID = "sw:Edit:TP_GRF_EXT:ED_CONNECT";
         Pos = MAP_APPFONT ( 13 , 109 ) ;
         Size = MAP_APPFONT ( 200 , 12 ) ;
         Text [ en-US ] = "[None]" ;
@@ -549,6 +571,7 @@ TabPage TP_GRF_EXT
     };
     PushButton PB_BROWSE
     {
+        HelpID = "sw:PushButton:TP_GRF_EXT:PB_BROWSE";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 230 , 109 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
@@ -558,6 +581,7 @@ TabPage TP_GRF_EXT
     };
     CheckBox CB_VERT
     {
+        HelpID = "sw:CheckBox:TP_GRF_EXT:CB_VERT";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         TabStop = TRUE ;
@@ -566,6 +590,7 @@ TabPage TP_GRF_EXT
     };
     CheckBox CB_HOR
     {
+        HelpID = "sw:CheckBox:TP_GRF_EXT:CB_HOR";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -573,6 +598,7 @@ TabPage TP_GRF_EXT
     };
     RadioButton RB_MIRROR_ALL_PAGES
     {
+        HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES";
         Pos = MAP_APPFONT ( 18 , 42 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -580,6 +606,7 @@ TabPage TP_GRF_EXT
     };
     RadioButton RB_MIRROR_LEFT_PAGES
     {
+        HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES";
         Pos = MAP_APPFONT ( 18 , 56 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -587,6 +614,7 @@ TabPage TP_GRF_EXT
     };
     RadioButton RB_MIRROR_RIGHT_PAGES
     {
+        HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES";
         Pos = MAP_APPFONT ( 18 , 70 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -624,6 +652,7 @@ TabPage TP_FRM_URL
     };
     Edit ED_URL
     {
+        HelpID = "sw:Edit:TP_FRM_URL:ED_URL";
         Pos = MAP_APPFONT ( 45 , 14 ) ;
         Size = MAP_APPFONT ( 149 , 12 ) ;
         Left = TRUE ;
@@ -638,6 +667,7 @@ TabPage TP_FRM_URL
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_FRM_URL:ED_NAME";
         Pos = MAP_APPFONT ( 45 , 30 ) ;
         Size = MAP_APPFONT ( 149 , 12 ) ;
         Left = TRUE ;
@@ -652,6 +682,7 @@ TabPage TP_FRM_URL
     };
     ComboBox CB_FRAME
     {
+        HelpID = "sw:ComboBox:TP_FRM_URL:CB_FRAME";
         Pos = MAP_APPFONT ( 45 , 46 ) ;
         Size = MAP_APPFONT ( 89 , 50 ) ;
         Left = TRUE ;
@@ -660,6 +691,7 @@ TabPage TP_FRM_URL
     };
     PushButton PB_SEARCH
     {
+        HelpID = "sw:PushButton:TP_FRM_URL:PB_SEARCH";
         Pos = MAP_APPFONT ( 198 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -673,12 +705,14 @@ TabPage TP_FRM_URL
     };
     CheckBox CB_SERVER
     {
+        HelpID = "sw:CheckBox:TP_FRM_URL:CB_SERVER";
         Pos = MAP_APPFONT ( 12 , 75 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Server-side image map";
     };
     CheckBox CB_CLIENT
     {
+        HelpID = "sw:CheckBox:TP_FRM_URL:CB_CLIENT";
         Pos = MAP_APPFONT ( 12 , 89 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Client-side image map";
@@ -705,6 +739,7 @@ TabPage TP_FRM_ADD
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_FRM_ADD:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 14 ) ;
         Size = MAP_APPFONT ( 157 , 12 ) ;
@@ -718,6 +753,7 @@ TabPage TP_FRM_ADD
     };
     Edit ED_ALT_NAME
     {
+        HelpID = "sw:Edit:TP_FRM_ADD:ED_ALT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 30 ) ;
         Size = MAP_APPFONT ( 157 , 12 ) ;
@@ -731,6 +767,7 @@ TabPage TP_FRM_ADD
     };
     ListBox LB_PREV
     {
+        HelpID = "sw:ListBox:TP_FRM_ADD:LB_PREV";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 46 ) ;
         Size = MAP_APPFONT ( 157 , 50 ) ;
@@ -749,6 +786,7 @@ TabPage TP_FRM_ADD
     };
     ListBox LB_NEXT
     {
+        HelpID = "sw:ListBox:TP_FRM_ADD:LB_NEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 62 ) ;
         Size = MAP_APPFONT ( 157 , 50 ) ;
@@ -767,6 +805,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_PROTECT_CONTENT
     {
+        HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT";
         Pos = MAP_APPFONT ( 12 , 91 ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -774,6 +813,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_PROTECT_FRAME
     {
+        HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME";
         Pos = MAP_APPFONT ( 12 , 105 ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -781,6 +821,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_PROTECT_SIZE
     {
+        HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE";
         Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -794,6 +835,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_EDIT_IN_READONLY
     {
+        HelpID = "sw:CheckBox:TP_FRM_ADD:CB_EDIT_IN_READONLY";
         Pos = MAP_APPFONT ( 12 , 146 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -801,6 +843,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_PRINT_FRAME
     {
+        HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME";
         Pos = MAP_APPFONT ( 12 , 160 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -823,6 +866,7 @@ TabPage TP_FRM_ADD
     };
     ListBox LB_TEXTFLOW
     {
+        HelpID = "sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 172 ) ;
         Size = MAP_APPFONT ( 167 , 50 ) ;
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index 6810f55e1a..1680f3d93b 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -44,6 +44,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_NO_WRAP
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -52,6 +53,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_LEFT
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT";
         Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -60,6 +62,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_RIGHT
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT";
         Pos = MAP_APPFONT ( 121 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -68,6 +71,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_PARALLEL
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL";
         Pos = MAP_APPFONT ( 177 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -76,6 +80,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_THROUGH
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH";
         Pos = MAP_APPFONT ( 6 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -84,6 +89,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_IDEAL
     {
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL";
         Pos = MAP_APPFONT ( 65 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 37 ) ;
         WordBreak = TRUE;
@@ -93,18 +99,21 @@ TabPage TP_FRM_WRAP
 
     CheckBox CB_ANCHOR_ONLY
     {
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY";
         Pos = MAP_APPFONT ( 139 , 111 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Text [ en-US ] = "~First paragraph" ;
     };
     CheckBox CB_TRANSPARENT
     {
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT";
         Pos = MAP_APPFONT ( 139 , 125 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Text [ en-US ] = "In bac~kground" ;
     };
     CheckBox CB_OUTLINE
     {
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE";
         Pos = MAP_APPFONT ( 139 , 139 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Hide = TRUE ;
@@ -112,6 +121,7 @@ TabPage TP_FRM_WRAP
     };
     CheckBox CB_ONLYOUTSIDE
     {
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE";
         Pos = MAP_APPFONT ( 139 , 153 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Hide = TRUE ;
@@ -138,6 +148,7 @@ TabPage TP_FRM_WRAP
     };
     MetricField ED_LEFT_MARGIN
     {
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 111 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -160,6 +171,7 @@ TabPage TP_FRM_WRAP
     };
     MetricField ED_RIGHT_MARGIN
     {
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 127 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -182,6 +194,7 @@ TabPage TP_FRM_WRAP
     };
     MetricField ED_TOP_MARGIN
     {
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 143 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -204,6 +217,7 @@ TabPage TP_FRM_WRAP
     };
     MetricField ED_BOTTOM_MARGIN
     {
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 159 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/ui/inc/frmdlg.hxx
index fa39f4b293..43be092b58 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/ui/inc/frmdlg.hxx
@@ -41,6 +41,7 @@ class SwFrmDlg : public SfxTabDialog
     BOOL                m_bFormat;
     BOOL                m_bNew;
     BOOL                m_bHTMLMode;
+    bool                m_bEnableVertPos;
     const SfxItemSet&   m_rSet;
     USHORT              m_nDlgType;
     SwWrtShell*         m_pWrtShell;
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index a858c23199..1f097d1c29 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -28,27 +28,17 @@
 #ifndef _FRMPAGE_HXX
 #define _FRMPAGE_HXX
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <sfx2/tabdlg.hxx>
 #include <svx/swframeposstrings.hxx>
 #include <swtypes.hxx>
 #include <bmpwin.hxx>
 #include <svx/swframeexample.hxx>
 #include <prcntfld.hxx>
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
 
 
 namespace sfx2{class FileDialogHelper;}
@@ -142,6 +132,10 @@ class SwFrmPage: public SfxTabPage
     FrmMap* pVMap;
     FrmMap* pHMap;
 
+    bool    m_bAllowVertPositioning;
+    bool    m_bIsMathOLE;
+    bool    m_bIsMathBaselineAlignment;
+
     virtual void    ActivatePage(const SfxItemSet& rSet);
     virtual int 	DeactivatePage(SfxItemSet *pSet);
 
@@ -205,6 +199,7 @@ public:
     void			SetFormatUsed(BOOL bFmt);
     void			SetFrmType(USHORT nType) 	{ nDlgType 	= nType;	 }
     inline BOOL		IsInGraficMode( void )		{ return nDlgType == DLG_FRM_GRF || nDlgType == DLG_FRM_OLE; }
+    void            EnableVerticalPositioning( bool bEnable );
 };
 
 class SwGrfExtPage: public SfxTabPage
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 60e15f866b..fa0af2e473 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -353,6 +353,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage
     FixedLine       aCrsrOptFL;
     CheckBox		aCrsrInProtCB;
 
+    FixedLine       m_aLayoutOptionsFL;
+    CheckBox		m_aMathBaselineAlignmentCB;
+
+    SwWrtShell *    m_pWrtShell;
+
+
     SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
     ~SwShdwCrsrOptionsTabPage();
 
@@ -362,6 +368,9 @@ public:
 
     virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
     virtual	void 		Reset( const SfxItemSet& rSet );
+
+    void    SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; }
+    virtual void        PageCreated( SfxAllItemSet aSet );
 };
 
 /*-----------------------------------------------------------------------
@@ -498,5 +507,3 @@ private:
 };
 #endif //PRODUCT
 #endif
-
-
diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc
index 892261512a..301acb1ddc 100644
--- a/sw/source/ui/inc/ribbar.hrc
+++ b/sw/source/ui/inc/ribbar.hrc
@@ -69,10 +69,7 @@
 #define	MN_CALC_POPUP				(RC_RIBBAR_BEGIN + 22)
 
 #define MN_NUMNAMES_POPUP			(RC_RIBBAR_BEGIN + 23)
-#define RID_INSERT_CTRL             (RC_RIBBAR_BEGIN + 24)
-#define RID_INSERT_OBJ_CTRL         (RC_RIBBAR_BEGIN + 25)
 #define RID_INSERT_FIELD_CTRL       (RC_RIBBAR_BEGIN + 26)
-#define RID_TBL_OPT_CTRL            (RC_RIBBAR_BEGIN + 27)
 #define RID_BEZIER_WIN   			(RC_RIBBAR_BEGIN + 28)
 #define RID_SCROLL_NAVI_TBX         (RC_RIBBAR_BEGIN + 29)
 #define RID_SCROLL_NAVIGATION_WIN   (RC_RIBBAR_BEGIN + 30)
diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc
index af1c013c1a..911309c8a5 100644
--- a/sw/source/ui/inc/swmn_tmpl.hrc
+++ b/sw/source/ui/inc/swmn_tmpl.hrc
@@ -57,7 +57,7 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_PAGE_DLG ; \
-        HelpID = FN_FORMAT_PAGE_DLG ; \
+        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
         Text [ en-US ] = "Pa~ge..." ; \
     };
 
@@ -74,7 +74,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_STYLE ; \
-        HelpID = MN_FORMAT_STYLE ; \
         Command = ".uno:StyleMenu" ; \
         Text [ en-US ] = "St~yle" ; \
         SubMenu = Menu\
@@ -113,13 +112,13 @@
                 MenuItem\
                 {\
                     Identifier = FN_SET_SUPER_SCRIPT ; \
-                    HelpID = FN_SET_SUPER_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
                     Text [ en-US ] = "Superscript" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_SET_SUB_SCRIPT ; \
-                    HelpID = FN_SET_SUB_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUB_SCRIPT ; \
                     Text [ en-US ] = "Subscript" ; \
                 };\
             };\
@@ -128,7 +127,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_ALGN ; \
-        HelpID = MN_FORMAT_ALGN ; \
         Command = ".uno:AlignTextMenu" ; \
         Text [ en-US ] = "A~lignment" ; \
         SubMenu = Menu\
@@ -153,7 +151,7 @@
                 MenuItem\
                 {\
                     Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
                     RadioCheck = TRUE ; \
                     Text [ en-US ] = "Justified" ; \
                 };\
@@ -163,7 +161,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_LINESPACE ; \
-        HelpID = MN_FORMAT_LINESPACE ; \
         Command = ".uno:LineSpacingMenu" ; \
         Text [ en-US ] = "Line Spacing" ; \
         _MenuItemFlags = MIB_RADIOCHECK ; \
@@ -208,21 +205,21 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_FIELD ;                                    \
-            HelpID = FN_EDIT_FIELD ;                                        \
+            HelpId = CMD_FN_EDIT_FIELD ;                                        \
             Text [ en-US ] = "Fields..." ;                             \
     };
 #define _MN_EDIT_FOOTNOTE                                                    \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_FOOTNOTE ;                                 \
-            HelpID = FN_EDIT_FOOTNOTE ;                                     \
+            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
             Text [ en-US ] = "Footnote/Endnote~..." ;                          \
         };
     #define _MN_EDIT_IDX_ENTRY_DLG                                          \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
-            HelpID = FN_EDIT_IDX_ENTRY_DLG ;                                \
+            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
             Text [ en-US ] = "Inde~x Entry..." ;                       \
     };
 
@@ -230,13 +227,13 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REDLINE_ACCEPT_DIRECT;                            \
-            HelpID = FN_REDLINE_ACCEPT_DIRECT ;                                \
+            HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;                                \
             Text [ en-US ] = "Accept Change" ;                       \
         };\
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REDLINE_REJECT_DIRECT ;                            \
-            HelpID = FN_REDLINE_REJECT_DIRECT ;                                \
+            HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;                                \
             Text [ en-US ] = "Reject Change" ;                       \
         };								\
     SEPARATOR ;
@@ -244,7 +241,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
-            HelpID = FN_EDIT_AUTH_ENTRY_DLG ;                               \
+            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
             Text [ en-US ] = "~Bibliography Entry...";                  \
     };                                                                  \
         SEPARATOR ;
@@ -257,19 +254,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem                                                            \
     {                                                                   \
         Identifier = FN_EDIT_HYPERLINK ;                           \
-        HelpID = FN_EDIT_HYPERLINK ;                               \
+        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
         Text [ en-US ] = "Edit Hyperlink...";                  \
     };                                                                  \
     MenuItem                                                            \
     {                                                                   \
         Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
-        HelpID =  FN_COPY_HYPERLINK_LOCATION;                               \
+        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
         Text [ en-US ] = "Copy Hyperlink ~Location";                  \
     };                                                                  \
     MenuItem                                                            \
     {                                                                   \
         Identifier = FN_REMOVE_HYPERLINK ;                           \
-        HelpID = FN_REMOVE_HYPERLINK ;                               \
+        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
         Text [ en-US ] = "Remo~ve Hyperlink";                  \
     };                                                                  
 
@@ -283,7 +280,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem\
     {\
         Identifier = FN_EDIT_HYPERLINK ; \
-        HelpID = FN_EDIT_HYPERLINK ; \
+        HelpId = CMD_FN_EDIT_HYPERLINK ; \
         Text [ en-US ] = "~Edit Hyperlink" ; \
     };
     
@@ -306,7 +303,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem\
     {\
         Identifier = FN_FORMAT_RESET ; \
-        HelpID = FN_FORMAT_RESET ; \
+        HelpId = CMD_FN_FORMAT_RESET ; \
         Text [ en-US ] = "~Default Formatting" ; \
     };
 
@@ -315,25 +312,25 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUMBER_NEWSTART;                                \
-            HelpId = FN_NUMBER_NEWSTART;                                    \
+            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
             Text[ en-US ] = "Restart Numbering";                            \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_CONTINUE;                                   \
-            HelpId = FN_NUM_CONTINUE;                                       \
+            HelpId = CMD_FN_NUM_CONTINUE;                                       \
             Text[ en-US ] = "Continue previous numbering";                  \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_BULLET_UP;                              \
-            HelpId = FN_NUM_BULLET_UP;                                  \
+            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
             Text[ en-US ] = "Up One Level";                              \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_BULLET_DOWN;                              \
-            HelpId = FN_NUM_BULLET_DOWN;                                  \
+            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
             Text[ en-US ] = "Down One Level";                              \
         };                                                                  
 
@@ -356,19 +353,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_UPDATE_CUR_TOX ;                                \
-            HelpID = FN_UPDATE_CUR_TOX ;                                    \
+            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
             Text [ en-US ] = "~Update Index/Table";                         \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_CURRENT_TOX;                               \
-            HelpID = FN_EDIT_CURRENT_TOX;                                   \
+            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
             Text [ en-US ] = "~Edit Index/Table";                           \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REMOVE_CUR_TOX;                                 \
-            HelpID = FN_REMOVE_CUR_TOX;                                     \
+            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
             Text [ en-US ] = "Delete Index/Table";                          \
         };                                                                  \
         SEPARATOR ;                                                         
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 5bb247187d..6038f4a2de 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -163,6 +163,8 @@ class SwTOXSelectTabPage : public SfxTabPage
 //	PushButton		aChapterDlgPB;	//#outline level,removed by zhaojianwei
     CheckBox		aAddStylesCB;
     PushButton		aAddStylesPB;
+    Point           aAddStylesPosDef;
+    Point           aAddStylesPosUser;
     //user
     CheckBox		aFromTablesCB;
     CheckBox		aFromFramesCB;
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx
index 828016c6e3..e074e37dda 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/ui/inc/unotxvw.hxx
@@ -156,7 +156,7 @@ public:
     void                    Invalidate();
 
     // temporary document used for PDF export of selections/multi-selections
-    SfxObjectShellRef       BuildTmpSelectionDoc( SfxObjectShellRef& );
+    SfxObjectShellRef       BuildTmpSelectionDoc();
 };
 
 /* -----------------17.09.98 12:52-------------------
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/ui/inc/usrpref.hxx
index 9f3f3e4f39..21b3e64405 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/ui/inc/usrpref.hxx
@@ -147,6 +147,8 @@ class SwMasterUsrPref : public SwViewOption
     sal_Int32	nDefTab;			//default tab stop distance
 
     sal_Bool    bIsSquaredPageMode; //default page mode for text grid
+    sal_Bool    bIsAlignMathObjectsToBaseline;
+
     SwContentViewConfig aContentConfig;
     SwLayoutViewConfig  aLayoutConfig;
     SwGridConfig        aGridConfig;
@@ -271,6 +273,13 @@ public:
                         aLayoutConfig.SetModified(); 
                 }
 
+    sal_Bool    IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
+    void        SetAlignMathObjectsToBaseline( sal_Bool bVal, sal_Bool bNoModify = sal_False ) 
+                { 
+                    bIsAlignMathObjectsToBaseline = bVal;
+                    if(!bNoModify)
+                        aLayoutConfig.SetModified(); 
+                }
 };
 
 #endif
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 85b33fda78..a5e5ff1918 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -83,7 +83,6 @@ class CommandEvent;
 class InsCaptionOpt;
 class SvGlobalName;
 class SvtAccessibilityOptions;
-class SwPrtOptions;
 class SwTransferable;
 class SwMailMergeConfigItem;
 class SwTxtNode; // #i23726#
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 14b26c0391..f7f423a440 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -320,9 +320,6 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     void	InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
     BOOL	UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
 
-        //  new fields
-    BOOL	UpdateField( sw::mark::IFieldmark &fieldBM);
-
     // Numerierung und Bullets
     /**
        Turns on numbering or bullets.
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5d9a390600..2da99a6f6c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -828,7 +828,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
     rHB.Show();
 
     SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox();
-    rTLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
+    rTLB.SetStyle(rTLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT);
     //aStylesTLB.SetSelectHdl(LINK(this, SwAddStylesDlg_Impl, SelectHdl));
     rTLB.GetModel()->SetSortMode(SortAscending);
     for(i = 0; i < MAXLEVEL; ++i)
@@ -1523,7 +1523,19 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, 	ListBox*, pBox)
         //aAddStylesPB.SetPosPixel(aPos);
     //}
     //else if( nType & TO_ILLUSTRATION )//<-removed end.
-    if( nType & TO_ILLUSTRATION )		//add by zhaojianwei
+        // initialize button positions
+    
+    //#i111993# add styles button has two different positions 
+    if( !aAddStylesPosDef.X() )
+    {
+        aAddStylesPosDef = ( aAddStylesPB.GetPosPixel() );
+        // move left!
+        Point aPos(aAddStylesPosDef);
+        aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
+        aAddStylesPosUser = aPos;
+    }
+    
+    if( nType & TO_ILLUSTRATION )       //add by zhaojianwei
         aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
                                     RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
     else if( nType & TO_TABLE )
@@ -1532,11 +1544,11 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, 	ListBox*, pBox)
     else if( nType & TO_USER )
     {
         aAddStylesCB.SetText(sAddStyleUser);
-        // move left!
-         Point aPos(aAddStylesPB.GetPosPixel());
-    //	aPos.X() = aChapterDlgPB.GetPosPixel().X();
-        aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
-        aAddStylesPB.SetPosPixel(aPos);
+        aAddStylesPB.SetPosPixel(aAddStylesPosUser);
+    }
+    else if( nType & TO_CONTENT )
+    {
+        aAddStylesPB.SetPosPixel(aAddStylesPosDef);
     }
 
     aCollectSameCB.Show( 0 != (nType & TO_INDEX) );
@@ -2124,7 +2136,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     FreeResource();
 
     sLevelStr = aLevelFT.GetText();
-    aLevelLB.SetWindowBits( WB_HSCROLL );
+    aLevelLB.SetStyle( aLevelLB.GetStyle() | WB_HSCROLL );
     aLevelLB.SetSpaceBetweenEntries(0);
     aLevelLB.SetSelectionMode( SINGLE_SELECTION );
     aLevelLB.SetHighlightRange();	// select full width
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 8220ed42ba..4532c50658 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -132,6 +132,7 @@ TabPage TP_TOX_SELECT
     };
     Edit			ED_TITLE
     {
+        HelpID = "sw:Edit:TP_TOX_SELECT:ED_TITLE";
         Pos = MAP_APPFONT ( 45 , 14 ) ;
         Size = MAP_APPFONT ( 203 , 12 ) ;
         Border = TRUE;
@@ -144,6 +145,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox			LB_TYPE
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_TYPE";
         Pos = MAP_APPFONT ( 45 , 30 ) ;
         Size = MAP_APPFONT ( 80 , 80 ) ;
         TabStop = TRUE ;
@@ -161,6 +163,7 @@ TabPage TP_TOX_SELECT
     };
     CheckBox		CB_READONLY
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_READONLY";
         Pos = MAP_APPFONT ( 51 , 46 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Check = TRUE;
@@ -180,6 +183,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox         LB_AREA
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_AREA";
         Pos = MAP_APPFONT ( 45 , 70 ) ;
         Size = MAP_APPFONT ( 80 , 12 ) ;
         TabStop = TRUE ;
@@ -198,6 +202,7 @@ TabPage TP_TOX_SELECT
     };
     NumericField    NF_LEVEL
     {
+        HelpID = "sw:NumericField:TP_TOX_SELECT:NF_LEVEL";
         Pos = MAP_APPFONT ( 231 , 72 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         Border = TRUE ;
@@ -218,6 +223,7 @@ TabPage TP_TOX_SELECT
     };
     CheckBox		CB_FROMHEADINGS
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS";
         Pos = MAP_APPFONT ( 12 , 99 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
         Check = TRUE;
@@ -234,6 +240,7 @@ TabPage TP_TOX_SELECT
 */	
     CheckBox CB_ADDSTYLES
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES";
         Pos = MAP_APPFONT ( 12 , 115 ) ;
         Size = MAP_APPFONT ( 75 , 10  ) ;
         Text [ en-US ] = "~Additional Styles";
@@ -244,6 +251,7 @@ TabPage TP_TOX_SELECT
     };
     PushButton		PB_ADDSTYLES
     {
+        HelpID = "sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES";
         Pos = MAP_APPFONT ( 115 , 114 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "..." ;
@@ -251,6 +259,7 @@ TabPage TP_TOX_SELECT
     };
     CheckBox		CB_TOXMARKS
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS";
         Pos = MAP_APPFONT ( 12 , 131 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Inde~x marks";
@@ -258,6 +267,7 @@ TabPage TP_TOX_SELECT
 
     RadioButton		RB_FROMCAPTIONS
     {
+        HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS";
         Pos = MAP_APPFONT ( 12 , 98 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Captions";
@@ -270,6 +280,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox LB_CAPTIONSEQUENCE
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE";
         Pos = MAP_APPFONT ( 55 , 112 ) ;
         Size = MAP_APPFONT ( 70 , 40 ) ;
         DropDown = TRUE;
@@ -283,6 +294,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox LB_DISPLAYTYPE
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE";
         Pos = MAP_APPFONT ( 55 , 128 ) ;
         Size = MAP_APPFONT ( 70 , 40 ) ;
         DropDown = TRUE;
@@ -296,54 +308,63 @@ TabPage TP_TOX_SELECT
     };
     RadioButton        RB_FROMOBJECTNAMES
     {
+        HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES";
         Pos = MAP_APPFONT ( 156 , 98 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Object names";
     };
     CheckBox		CB_COLLECTSAME
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME";
         Pos = MAP_APPFONT ( 12 , 98 ) ;
         Size = MAP_APPFONT ( 121 , 10 ) ;
         Text [ en-US ] = "Combine identical entries";
     };
     CheckBox		CB_USEFF
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USEFF";
         Pos = MAP_APPFONT ( 18 ,  111 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "Combine identical entries with p or ~pp";
     };
     CheckBox CB_USE_DASH
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH";
         Pos = MAP_APPFONT ( 18 , 124 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "Combine with -";
     };
     CheckBox		CB_CASESENSITIVE
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE";
         Pos = MAP_APPFONT ( 18 , 137 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "Case sensitive";
     };
     CheckBox		CB_INITIALCAPS
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS";
         Pos = MAP_APPFONT ( 136 , 98 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "AutoCapitalize entries";
     };
     CheckBox		CB_KEYASENTRY
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY";
         Pos = MAP_APPFONT ( 136, 111 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "Keys as separate entries";
     };
     CheckBox	CB_FROMFILE
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE";
         Pos = MAP_APPFONT ( 136 , 124 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         Text [ en-US ] = "~Concordance file";
     };
     MenuButton 	MB_AUTOMARK
     {
+        HelpID = "sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK";
         Pos = MAP_APPFONT ( 136 , 137 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -372,30 +393,35 @@ TabPage TP_TOX_SELECT
     };
     CheckBox	CB_FROMTABLES
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES";
         Pos = MAP_APPFONT ( 112 , 99 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         Text [ en-US ] = "Tables";
     };
     CheckBox	CB_FROMFRAMES
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES";
         Pos = MAP_APPFONT ( 182 , 99 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         Text [ en-US ] = "Te~xt frames";
     };
     CheckBox	CB_FROMGRAPHICS
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS";
         Pos = MAP_APPFONT ( 112 , 113 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         Text [ en-US ] = "Graphics";
     };
     CheckBox		CB_FROMOLE
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE";
         Pos = MAP_APPFONT ( 182 , 113 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         Text [ en-US ] = "OLE objects";
     };
     CheckBox		CB_LEVELFROMCHAPTER
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER";
         Pos = MAP_APPFONT ( 118 ,  127 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         Text [ en-US ] = "Use level from source chapter";
@@ -443,6 +469,7 @@ TabPage TP_TOX_SELECT
     };
     CheckBox CB_SEQUENCE
     {
+        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE";
         Pos = MAP_APPFONT ( 12, 70) ;
         Size = MAP_APPFONT ( 100, 10 ) ;
         Text [ en-US ] = "~Number entries";
@@ -455,6 +482,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox LB_BRACKET
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_BRACKET";
         Pos = MAP_APPFONT ( 75, 84) ;
         Size = MAP_APPFONT ( 40, 50 ) ;
         Border = TRUE;
@@ -495,6 +523,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE";
         Pos = MAP_APPFONT ( 47, 164) ;
         Size = MAP_APPFONT ( 80, 50 ) ;
         Border = TRUE;
@@ -508,6 +537,7 @@ TabPage TP_TOX_SELECT
     };
     ListBox LB_SORTALG
     {
+        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_SORTALG";
         Pos = MAP_APPFONT ( 201, 164) ;
         Size = MAP_APPFONT ( 50, 50 ) ;
         Border = TRUE;
@@ -549,6 +579,7 @@ TabPage TP_TOX_ENTRY
         Size = MAP_APPFONT ( 136, 12 ) ;
         ImageButton WIN_LEFT_SCROLL
         {
+            HelpID = "sw:ImageButton:TP_TOX_ENTRY:WIN_LEFT_SCROLL";
             Pos = MAP_APPFONT (  0, 0 ) ;
             Size = MAP_APPFONT ( 10, 12 ) ;
             Symbol = IMAGEBUTTON_ARROW_LEFT;
@@ -563,6 +594,7 @@ TabPage TP_TOX_ENTRY
         };
         ImageButton WIN_RIGHT_SCROLL
         {
+            HelpID = "sw:ImageButton:TP_TOX_ENTRY:WIN_RIGHT_SCROLL";
             Pos = MAP_APPFONT (  126, 0 ) ;
             Size = MAP_APPFONT ( 10, 12 ) ;
             Symbol = IMAGEBUTTON_ARROW_RIGHT;
@@ -649,48 +681,56 @@ TabPage TP_TOX_ENTRY
     };
     PushButton PB_ALL_LEVELS
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ALL_LEVELS";
         Pos = MAP_APPFONT ( 209 , 14 ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "~All";
     };
     PushButton PB_ENTRYNO
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO";
         Pos = MAP_APPFONT ( 37 , 32 ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "Chapter no.";
     };
     PushButton PB_ENTRY
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ENTRY";
         Pos = MAP_APPFONT (  80, 32 ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "Entry text";
     };
     PushButton PB_CHAPTERINFO
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO";
         Pos = MAP_APPFONT ( 123 , 32 ) ;
         Size = MAP_APPFONT ( 40, 14) ;
         Text [ en-US ] = "~Chapter info";
     };
     PushButton PB_PAGENO
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_PAGENO";
         Pos = MAP_APPFONT ( 166 , 32 ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "Page no.";
     };
     PushButton PB_TAB
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_TAB";
         Pos = MAP_APPFONT ( 209 ,32  ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "Tab stop";
     };
     PushButton PB_HYPERLINK
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK";
         Pos = MAP_APPFONT ( 209 , 32 ) ;
         Size = MAP_APPFONT ( 40, 14 ) ;
         Text [ en-US ] = "H~yperlink";
     };
     ListBox LB_AUTHFIELD
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_AUTHFIELD";
         Pos = MAP_APPFONT ( 37 , 33 ) ;
         Size = MAP_APPFONT ( 59, 60 ) ;
         DropDown = TRUE;
@@ -699,12 +739,14 @@ TabPage TP_TOX_ENTRY
     };
     PushButton PB_AUTHINSERT
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT";
         Pos = MAP_APPFONT ( 99 , 32 ) ;
         Size = MAP_APPFONT ( 39, 14 ) ;
         Text [ en-US ] = "~Insert";
     };
     PushButton PB_AUTHREMOVE
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE";
         Pos = MAP_APPFONT ( 142 , 32 ) ;
         Size = MAP_APPFONT ( 39, 14 ) ;
         Text [ en-US ] = "~Remove";
@@ -717,6 +759,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_CHARSTYLE
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE";
         Pos = MAP_APPFONT ( 100 , 53 ) ;
         Size = MAP_APPFONT ( 93, 60 ) ;
         TabStop = TRUE ;
@@ -724,6 +767,7 @@ TabPage TP_TOX_ENTRY
     };
     PushButton PB_EDITSTYLE
     {
+        HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE";
         Pos = MAP_APPFONT ( 199 , 52 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         Text [ en-US ] = "~Edit...";
@@ -736,6 +780,7 @@ TabPage TP_TOX_ENTRY
     };
     ComboBox CB_FILLCHAR
     {
+        HelpID = "sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR";
         Pos = MAP_APPFONT ( 100 , 69 ) ;
         Size = MAP_APPFONT ( 40, 40 ) ;
         TabStop = TRUE ;
@@ -749,6 +794,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_CHAPTERENTRY
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY";
         Pos = MAP_APPFONT ( 100 , 69 ) ;
         Size = MAP_APPFONT ( 93, 40 ) ;
         TabStop = TRUE ;
@@ -769,6 +815,7 @@ TabPage TP_TOX_ENTRY
         };
     ListBox LB_ENTRY_NO
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_ENTRY_NO";
         Pos = MAP_APPFONT ( 100 , 69 ) ;
         Size = MAP_APPFONT ( 93, 40 ) ;
         TabStop = TRUE ;
@@ -788,6 +835,7 @@ TabPage TP_TOX_ENTRY
         };
     NumericField    NF_LEVEL_OL
         {
+        HelpID = "sw:NumericField:TP_TOX_ENTRY:NF_LEVEL_OL";
             Pos = MAP_APPFONT ( 100 , 85 ) ;
             Size = MAP_APPFONT ( 20 , 12 ) ;
             Border = TRUE ;
@@ -809,6 +857,7 @@ TabPage TP_TOX_ENTRY
     };
     MetricField MF_TABPOS
     {
+        HelpID = "sw:MetricField:TP_TOX_ENTRY:MF_TABPOS";
         Pos = MAP_APPFONT ( 100 , 85 ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
         Border = TRUE ;
@@ -827,6 +876,7 @@ TabPage TP_TOX_ENTRY
     };
     CheckBox CB_AUTORIGHT
     {
+        HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT";
         Pos = MAP_APPFONT ( 143 , 86 ) ;
         Size = MAP_APPFONT ( 100, 10 ) ;
         Text [ en-US ] = "Align right";
@@ -839,6 +889,7 @@ TabPage TP_TOX_ENTRY
     };
     CheckBox CB_RELTOSTYLE
     {
+        HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE";
         Pos = MAP_APPFONT ( 37 , 110 ) ;
         Size = MAP_APPFONT ( 200, 10 ) ;
         Text [ en-US ] = "Tab position relati~ve to Paragraph Style indent";
@@ -851,6 +902,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_MAIN_ENTRY_STYLE
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE";
         Pos = MAP_APPFONT ( 157 , 110 ) ;
         Size = MAP_APPFONT ( 92, 80 ) ;
         TabStop = TRUE ;
@@ -860,12 +912,14 @@ TabPage TP_TOX_ENTRY
 
     CheckBox CB_ALPHADELIM
     {
+        HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM";
         Pos = MAP_APPFONT ( 37 , 126 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text [ en-US ] = "Alphabetical delimiter";
     };
     CheckBox CB_COMMASEPARATED
     {
+        HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED";
         Pos = MAP_APPFONT ( 37 , 140 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text [ en-US ] = "Key separated by commas";
@@ -878,12 +932,14 @@ TabPage TP_TOX_ENTRY
     };
     RadioButton RB_DOCPOS
     {
+        HelpID = "sw:RadioButton:TP_TOX_ENTRY:RB_DOCPOS";
         Pos = MAP_APPFONT ( 40 , 113) ;
         Size = MAP_APPFONT ( 94, 10  ) ;
         Text [ en-US ] = "Document ~position ";
     };
     RadioButton RB_SORTCONTENT
     {
+        HelpID = "sw:RadioButton:TP_TOX_ENTRY:RB_SORTCONTENT";
         Pos = MAP_APPFONT ( 136 , 113 ) ;
         Size = MAP_APPFONT ( 90, 10  ) ;
         Text [ en-US ] = "~Content";
@@ -902,6 +958,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_FIRSTKEY
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_FIRSTKEY";
         Pos = MAP_APPFONT ( 60 , 138 ) ;
         Size = MAP_APPFONT ( 159, 50  ) ;
         Border = TRUE;
@@ -919,6 +976,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTUP1
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP1";
         Pos = MAP_APPFONT ( 222 , 138 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -932,6 +990,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTDOWN1
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN1";
         Pos = MAP_APPFONT ( 237 , 138 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -944,6 +1003,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTUP2
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP2";
         Pos = MAP_APPFONT ( 222 , 153 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -957,6 +1017,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTDOWN2
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN2";
         Pos = MAP_APPFONT ( 237 , 153 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -969,6 +1030,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTUP3
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP3";
         Pos = MAP_APPFONT ( 222 , 168 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -982,6 +1044,7 @@ TabPage TP_TOX_ENTRY
     };
     ImageRadioButton RB_SORTDOWN3
     {
+        HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN3";
         Pos = MAP_APPFONT ( 237 ,168 ) ;
         Size = MAP_APPFONT ( 12, 12  ) ;
         RadioButtonImage =
@@ -1000,6 +1063,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_SECONDKEY
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_SECONDKEY";
         Pos = MAP_APPFONT ( 60 , 153 ) ;
         Size = MAP_APPFONT ( 159, 50  ) ;
         Border = TRUE;
@@ -1013,6 +1077,7 @@ TabPage TP_TOX_ENTRY
     };
     ListBox LB_THIRDKEY
     {
+        HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_THIRDKEY";
         Pos = MAP_APPFONT ( 60 , 168 ) ;
         Size = MAP_APPFONT ( 159, 50  ) ;
         Border = TRUE;
@@ -1052,6 +1117,7 @@ TabPage TP_TOX_STYLES
     };
     ListBox LB_LEVEL
     {
+        HelpID = "sw:ListBox:TP_TOX_STYLES:LB_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 102 , 131 ) ;
@@ -1067,6 +1133,7 @@ TabPage TP_TOX_STYLES
     };
     ListBox LB_PARALAY
     {
+        HelpID = "sw:ListBox:TP_TOX_STYLES:LB_PARALAY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 142 , 25 ) ;
         Size = MAP_APPFONT ( 101 , 131 ) ;
@@ -1076,6 +1143,7 @@ TabPage TP_TOX_STYLES
     };
     PushButton BT_STD
     {
+        HelpID = "sw:PushButton:TP_TOX_STYLES:BT_STD";
         Pos = MAP_APPFONT ( 64 , 162 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -1083,6 +1151,7 @@ TabPage TP_TOX_STYLES
     };
     ImageButton BT_ASSIGN
     {
+        HelpID = "sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN";
         Pos = MAP_APPFONT ( 118 , 28 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -1097,6 +1166,7 @@ TabPage TP_TOX_STYLES
     };
     PushButton BT_EDIT_STYLE
     {
+        HelpID = "sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE";
         Pos = MAP_APPFONT ( 193 , 162 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -1136,6 +1206,7 @@ ModalDialog DLG_ADD_IDX_STYLES
     };
     ImageButton PB_LEFT
     {
+        HelpID = "sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT";
         Pos = MAP_APPFONT ( 12 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         TabStop = TRUE ;
@@ -1150,6 +1221,7 @@ ModalDialog DLG_ADD_IDX_STYLES
     };
     ImageButton PB_RIGHT
     {
+        HelpID = "sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT";
         Pos = MAP_APPFONT ( 65 , 182 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 6a4ce1934d..e0a1a4df9c 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -275,7 +275,7 @@ ModalDialog DLG_EDIT_IDXMARK
     Moveable = TRUE ;
     Closeable = TRUE;
     Sizeable = FALSE ;
-    HelpID = FN_EDIT_IDX_ENTRY_DLG;
+    HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG;
     SVLook = TRUE ;
     #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL	
     Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ;
@@ -294,7 +294,7 @@ ModalDialog DLG_EDIT_IDXMARK_CJK
     Moveable = TRUE ;
     Closeable = TRUE;
     Sizeable = FALSE ;
-    HelpID = FN_EDIT_IDX_ENTRY_DLG;
+    HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG;
     SVLook = TRUE ;
     #define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK
     Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ;
@@ -315,7 +315,7 @@ ModelessDialog DLG_INSIDXMARK
     Sizeable = FALSE ;
     Hide = TRUE ;
 //	Zoomable = TRUE ;
-    HelpID = FN_INSERT_IDX_ENTRY_DLG;
+    HelpId = CMD_FN_INSERT_IDX_ENTRY_DLG;
     SVLook = TRUE ;
     #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL	
     Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ;
@@ -336,7 +336,7 @@ ModelessDialog DLG_INSIDXMARK_CJK
     Closeable = TRUE;
     Sizeable = FALSE ;
 //	Zoomable = TRUE ;
-    HelpID = FN_INSERT_IDX_ENTRY_DLG;
+    HelpId = CMD_FN_INSERT_IDX_ENTRY_DLG;
     SVLook = TRUE ;
     #define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK
     Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ;
@@ -392,6 +392,7 @@ ModalDialog DLG_NEW_USER_IDX
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:DLG_NEW_USER_IDX:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 15 ) ;
         Size = MAP_APPFONT ( 78 , 12 ) ;
@@ -523,7 +524,7 @@ ModalDialog DLG_EDIT_AUTHMARK
     Moveable = TRUE ;
     Closeable = TRUE ;
     Sizeable = FALSE ;
-    HelpID = FN_EDIT_AUTH_ENTRY_DLG;
+    HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 218 , 118 ) ;
     #define RADIO_BUTTON_HEIGHT 0
@@ -536,7 +537,7 @@ ModelessDialog DLG_INSAUTHMARK
     Closeable = TRUE ;
     Sizeable = FALSE ;
 //	Zoomable = TRUE ;
-    HelpID = FN_INSERT_AUTH_ENTRY_DLG;
+    HelpId = CMD_FN_INSERT_AUTH_ENTRY_DLG;
     SVLook = TRUE ;
     #define RADIO_BUTTON_HEIGHT 30
     Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ;
diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src
index 83db407d1a..d5d11ed530 100644
--- a/sw/source/ui/index/multmrk.src
+++ b/sw/source/ui/index/multmrk.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_MULTMRK
 {
-    HelpID = FN_EDIT_IDX_ENTRY_DLG ;
+    HelpID = CMD_FN_EDIT_IDX_ENTRY_DLG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 220 , 95 ) ;
@@ -65,6 +65,7 @@ ModalDialog DLG_MULTMRK
     };
     ListBox LB_TOX
     {
+        HelpID = "sw:ListBox:DLG_MULTMRK:LB_TOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 37 ) ;
         Size = MAP_APPFONT ( 100 , 49 ) ;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index be034b3909..5253673c72 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1204,8 +1204,9 @@ public:
 struct TextInfo
 {
     sal_uInt16 nToxField;
-    sal_uInt16 nHelpId;
+    const char* pHelpId;
 };
+
 static const TextInfo aTextInfoArr[] =
 {
     {AUTH_FIELD_IDENTIFIER,      HID_AUTH_FIELD_IDENTIFIER      },
@@ -1741,7 +1742,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
             pTypeListBox->SetPosPixel(bLeft ? aTR1 : aTR2);
             pTypeListBox->Show();
             pTypeListBox->SetSelectHdl(LINK(this, SwCreateAuthEntryDlg_Impl, EnableHdl));
-            pTypeListBox->SetHelpId(aCurInfo.nHelpId);
+            pTypeListBox->SetHelpId(aCurInfo.pHelpId);
 
         }
         else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode)
@@ -1769,7 +1770,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
             pIdentifierBox->SetSizePixel(aTmp);
             pIdentifierBox->SetPosPixel(bLeft ? aTR1 : aTR2);
             pIdentifierBox->Show();
-            pIdentifierBox->SetHelpId(aCurInfo.nHelpId);
+            pIdentifierBox->SetHelpId(aCurInfo.pHelpId);
         }
         else
         {
@@ -1780,7 +1781,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
             pEdits[nIndex]->SetPosPixel(bLeft ? aTR1 : aTR2);
             pEdits[nIndex]->SetText(pFields[aCurInfo.nToxField]);
             pEdits[nIndex]->Show();
-            pEdits[nIndex]->SetHelpId(aCurInfo.nHelpId);
+            pEdits[nIndex]->SetHelpId(aCurInfo.pHelpId);
             if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField)
             {
                 pEdits[nIndex]->SetModifyHdl(LINK(this, SwCreateAuthEntryDlg_Impl, ShortNameHdl));
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 98eaf8d466..98eaf8d466 100755..100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src
index 9ca4254eb6..39529dd67c 100644
--- a/sw/source/ui/misc/bookmark.src
+++ b/sw/source/ui/misc/bookmark.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_INSERT_BOOKMARK
 {
-    HelpID = FN_INSERT_BOOKMARK ;
+    HelpID = CMD_FN_INSERT_BOOKMARK ;
     OUTPUTSIZE = TRUE ;
     Size = MAP_APPFONT ( 179 , 96 ) ;
     /* ### ACHTUNG: Neuer Text in Resource? Textmarke einfügen : Textmarke einf³gen */
@@ -54,6 +54,7 @@ ModalDialog DLG_INSERT_BOOKMARK
     };
     ComboBox CB_BOOKMARK
     {
+        HelpID = "sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 99 , 76 ) ;
         TABSTOP = TRUE ;
@@ -62,6 +63,7 @@ ModalDialog DLG_INSERT_BOOKMARK
     };
     PushButton BT_DELETE
     {
+        HelpID = "sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE";
         Pos = MAP_APPFONT ( 123 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */
diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src
index bdb4d55eb2..bc983676d7 100644
--- a/sw/source/ui/misc/docfnote.src
+++ b/sw/source/ui/misc/docfnote.src
@@ -78,6 +78,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_NUMVIEW
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMVIEW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 59 , 72 ) ;
@@ -94,6 +95,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     NumericField FLD_OFFSET
     {
+        HelpID = "sw:NumericField:TP_FOOTNOTEOPTION:FLD_OFFSET";
         Pos = MAP_APPFONT ( 189 , 14 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Spin = TRUE ;
@@ -112,6 +114,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_NUMCOUNT
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMCOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 29 ) ;
         Size = MAP_APPFONT ( 59 , 50 ) ;
@@ -135,6 +138,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     Edit ED_PREFIX
     {
+        HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 44 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
@@ -151,6 +155,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     Edit ED_SUFFIX
     {
+        HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 189 , 44 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
@@ -166,6 +171,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     RadioButton RB_POS_PAGE
     {
+        HelpID = "sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE";
         Pos = MAP_APPFONT ( 65 , 62 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "~End of page" ;
@@ -174,6 +180,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     RadioButton RB_POS_CHAPTER
     {
+        HelpID = "sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER";
         Pos = MAP_APPFONT ( 65 , 75 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "En~d of document" ;
@@ -193,6 +200,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_PARA_TEMPL
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_PARA_TEMPL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 48 , 100 ) ;
         Size = MAP_APPFONT ( 58 , 80 ) ;
@@ -210,6 +218,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_PAGE_TEMPL
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 48 , 116) ;
         Size = MAP_APPFONT ( 58 , 80 ) ;
@@ -232,6 +241,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_ANCHR_CHARFMT
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 186 , 100 ) ;
         Size = MAP_APPFONT ( 65 , 72 ) ;
@@ -248,6 +258,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     ListBox LB_TEXT_CHARFMT
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 186 , 116 ) ;
         Size = MAP_APPFONT ( 65 , 72 ) ;
@@ -270,6 +281,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     Edit ED_CONT
     {
+        HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_CONT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88, 145 ) ;
         Size = MAP_APPFONT ( 160 , 12 ) ;
@@ -286,6 +298,7 @@ TabPage TP_FOOTNOTEOPTION
     };
     Edit ED_CONT_FROM
     {
+        HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_CONT_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 161 ) ;
         Size = MAP_APPFONT ( 160 , 12 ) ;
@@ -316,6 +329,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_NUMVIEW
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 59 , 72 ) ;
@@ -343,6 +357,7 @@ TabPage TP_ENDNOTEOPTION
     };
     NumericField FLD_OFFSET
     {
+        HelpID = "sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET";
         Pos = MAP_APPFONT ( 189 , 14 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Spin = TRUE ;
@@ -361,6 +376,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_NUMCOUNT
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_NUMCOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 62 , 72 ) ;
@@ -376,6 +392,7 @@ TabPage TP_ENDNOTEOPTION
     };
     Edit ED_PREFIX
     {
+        HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX";
         Pos = MAP_APPFONT ( 65 , 30 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
         Border = TRUE ;
@@ -392,6 +409,7 @@ TabPage TP_ENDNOTEOPTION
     };
     Edit ED_SUFFIX
     {
+        HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX";
         Pos = MAP_APPFONT ( 189 , 30 ) ;
         Size = MAP_APPFONT ( 59 , 12 ) ;
         Border = TRUE ;
@@ -407,6 +425,7 @@ TabPage TP_ENDNOTEOPTION
     };
     RadioButton RB_POS_PAGE
     {
+        HelpID = "sw:RadioButton:TP_ENDNOTEOPTION:RB_POS_PAGE";
         Pos = MAP_APPFONT ( 12 , 104 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "End ~of page" ;
@@ -415,6 +434,7 @@ TabPage TP_ENDNOTEOPTION
     };
     RadioButton RB_POS_CHAPTER
     {
+        HelpID = "sw:RadioButton:TP_ENDNOTEOPTION:RB_POS_CHAPTER";
         Pos = MAP_APPFONT ( 12 , 118 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "End of ~document" ;
@@ -434,6 +454,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_PARA_TEMPL
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 51 , 56 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
@@ -451,6 +472,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_PAGE_TEMPL
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 51 , 72 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
@@ -472,6 +494,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_ANCHR_CHARFMT
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 186 , 56 ) ;
         Size = MAP_APPFONT ( 65 , 72 ) ;
@@ -488,6 +511,7 @@ TabPage TP_ENDNOTEOPTION
     };
     ListBox LB_TEXT_CHARFMT
     {
+        HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 186 , 72 ) ;
         Size = MAP_APPFONT ( 65 , 72 ) ;
@@ -511,6 +535,7 @@ TabPage TP_ENDNOTEOPTION
     };
     Edit ED_CONT
     {
+        HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_CONT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 101 ) ;
         Size = MAP_APPFONT ( 114 , 12 ) ;
@@ -527,6 +552,7 @@ TabPage TP_ENDNOTEOPTION
     };
     Edit ED_CONT_FROM
     {
+        HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_CONT_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 116 ) ;
         Size = MAP_APPFONT ( 114 , 12 ) ;
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5374ddd2e2..ddb966aad2 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -107,7 +107,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
 
     aGroupTLB.SetHelpId(HID_GLOS_GROUP_TREE);
     aGroupTLB.SetTabs( &nTabs[0], MAP_APPFONT );
-    aGroupTLB.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT);
+    aGroupTLB.SetStyle(aGroupTLB.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT);
     aGroupTLB.SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl));
     aGroupTLB.GetModel()->SetSortMode(SortAscending);
     aNewPB.SetClickHdl(LINK(this, SwGlossaryGroupDlg, NewHdl));
diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src
index 75a03eb85e..9bd9489977 100644
--- a/sw/source/ui/misc/glosbib.src
+++ b/sw/source/ui/misc/glosbib.src
@@ -38,6 +38,7 @@ ModalDialog DLG_BIB_BASE
     Text [ en-US ] = "Edit Categories" ;
     PushButton PB_NEW
     {
+        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_NEW";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 293 , 66 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -46,6 +47,7 @@ ModalDialog DLG_BIB_BASE
     };
     PushButton PB_DELETE
     {
+        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_DELETE";
         Pos = MAP_APPFONT ( 293 , 83 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */
@@ -55,6 +57,7 @@ ModalDialog DLG_BIB_BASE
     };
     PushButton PB_RENAME
     {
+        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_RENAME";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 293 , 100 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -88,6 +91,7 @@ ModalDialog DLG_BIB_BASE
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:DLG_BIB_BASE:ED_NAME";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         TabStop = TRUE ;
@@ -102,6 +106,7 @@ ModalDialog DLG_BIB_BASE
     };
     ListBox LB_PATH
     {
+        HelpID = "sw:ListBox:DLG_BIB_BASE:LB_PATH";
         Pos = MAP_APPFONT ( 174 , 14 ) ;
         Size = MAP_APPFONT ( 107 , 50 ) ;
         DropDown = TRUE ;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index faec81b639..b5c137a4e5 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -294,7 +294,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
         aInsertBtn.Enable(sal_False);
     aNameED.GrabFocus();
     aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY);
-    aCategoryBox.SetWindowBits(WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
+    aCategoryBox.SetStyle(aCategoryBox.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT);
     aCategoryBox.GetModel()->SetSortMode(SortAscending);
     aCategoryBox.SetHighlightRange();	// ueber volle Breite selektieren
     aCategoryBox.SetNodeDefaultImages( );
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 12d6ab9e81..5ad32faa2f 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -32,7 +32,7 @@
  // #define DLG_GLOSSARY 256
 ModalDialog DLG_GLOSSARY
 {
-    HelpID = FN_GLOSSARY_DLG ;
+    HelpID = CMD_FN_GLOSSARY_DLG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 375 , 164 ) ;
@@ -40,6 +40,7 @@ ModalDialog DLG_GLOSSARY
     Moveable = TRUE ;
     CheckBox CB_INSERT_TIP
     {
+        HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP";
         Pos = MAP_APPFONT ( 12 , 12 ) ;
         Size = MAP_APPFONT ( 200 , 12 ) ;
         TabStop = TRUE ;
@@ -54,6 +55,7 @@ ModalDialog DLG_GLOSSARY
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:DLG_GLOSSARY:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 29 ) ;
         Size = MAP_APPFONT ( 85 , 12 ) ;
@@ -70,6 +72,7 @@ ModalDialog DLG_GLOSSARY
     };
     Edit ED_SHORTNAME
     {
+        HelpID = "sw:Edit:DLG_GLOSSARY:ED_SHORTNAME";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 203 , 29 ) ;
@@ -98,6 +101,7 @@ ModalDialog DLG_GLOSSARY
     };
     CheckBox CB_FILE_REL
     {
+        HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL";
         Pos = MAP_APPFONT ( 14 , 145 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         TabStop = TRUE ;
@@ -105,6 +109,7 @@ ModalDialog DLG_GLOSSARY
     };
     CheckBox CB_NET_REL
     {
+        HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_NET_REL";
         Pos = MAP_APPFONT ( 109 , 145 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         Text [ en-US ] = "Inte~rnet" ;
@@ -122,6 +127,7 @@ ModalDialog DLG_GLOSSARY
     };
     CheckBox CB_SHOW_EXAMPLE
     {
+        HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE";
         Pos = MAP_APPFONT ( 231 , 145 ) ;
         Size = MAP_APPFONT ( 82 , 12 ) ;
         Text [ en-US ] = "Sho~w preview";
@@ -151,6 +157,7 @@ ModalDialog DLG_GLOSSARY
     };
     MenuButton PB_EDIT
     {
+        HelpID = "sw:MenuButton:DLG_GLOSSARY:PB_EDIT";
         Pos = MAP_APPFONT ( 319 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "AutoTe~xt" ;
@@ -158,6 +165,7 @@ ModalDialog DLG_GLOSSARY
     };
     PushButton PB_BIB
     {
+        HelpID = "sw:PushButton:DLG_GLOSSARY:PB_BIB";
         Pos = MAP_APPFONT ( 319 , 77 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "C~ategories..." ;
@@ -165,6 +173,7 @@ ModalDialog DLG_GLOSSARY
     };
     PushButton PB_PATH
     {
+        HelpID = "sw:PushButton:DLG_GLOSSARY:PB_PATH";
         Pos = MAP_APPFONT ( 319 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -308,6 +317,7 @@ ModalDialog DLG_RENAME_GLOS
     };
     Edit ED_ON
     {
+        HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_ON";
         ReadOnly = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 44 , 12 ) ;
@@ -322,6 +332,7 @@ ModalDialog DLG_RENAME_GLOS
     };
     Edit ED_OS
     {
+        HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_OS";
         ReadOnly = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 200 , 12 ) ;
@@ -336,6 +347,7 @@ ModalDialog DLG_RENAME_GLOS
     };
     Edit ED_NN
     {
+        HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_NN";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 44 , 27 ) ;
@@ -350,6 +362,7 @@ ModalDialog DLG_RENAME_GLOS
     };
     Edit ED_NS
     {
+        HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_NS";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 200 , 27 ) ;
diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src
index fda4b92b0d..c462e01188 100644
--- a/sw/source/ui/misc/insfnote.src
+++ b/sw/source/ui/misc/insfnote.src
@@ -31,6 +31,7 @@
  // #define DLG_INS_FOOTNOTE 257
 ModalDialog DLG_INS_FOOTNOTE
 {
+    HelpID = "sw:ModalDialog:DLG_INS_FOOTNOTE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 160 , 100 ) ;
@@ -39,6 +40,7 @@ ModalDialog DLG_INS_FOOTNOTE
     Moveable = TRUE ;
     Edit ED_NUMBER_CHAR
     {
+        HelpID = "sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 27 ) ;
@@ -71,6 +73,7 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     ImageButton BT_PREV
     {
+        HelpID = "sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV";
         Pos = MAP_APPFONT ( 104 , 82 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         TabStop = TRUE ;
@@ -79,6 +82,7 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     ImageButton BT_NEXT
     {
+        HelpID = "sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT";
         Pos = MAP_APPFONT ( 130 , 82 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         TabStop = TRUE ;
@@ -87,6 +91,7 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     RadioButton RB_NUMBER_AUTO
     {
+        HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 79 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
@@ -96,6 +101,7 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     RadioButton RB_NUMBER_CHAR
     {
+        HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
         Text [ en-US ] = "~Character" ;
@@ -108,12 +114,14 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     PushButton BT_NUMBER_CHAR
     {
+        HelpID = "sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR";
         Pos = MAP_APPFONT ( 69 , 42 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "..." ;
     };
     RadioButton RB_TYPE_FTN
     {
+        HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN";
         Pos = MAP_APPFONT ( 12 , 70 ) ;
         Size = MAP_APPFONT ( 79 , 10 ) ;
         TabStop = TRUE ;
@@ -123,6 +131,7 @@ ModalDialog DLG_INS_FOOTNOTE
     };
     RadioButton RB_TYPE_ENDNOTE
     {
+        HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE";
         Pos = MAP_APPFONT ( 12 , 83 ) ;
         Size = MAP_APPFONT ( 79 , 10 ) ;
         Text [ en-US ] = "~Endnote" ;
diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src
index 61cee918d7..feb17ca5bb 100644
--- a/sw/source/ui/misc/linenum.src
+++ b/sw/source/ui/misc/linenum.src
@@ -47,6 +47,7 @@ TabPage TP_LINENUMBERING
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_NUMBERING_ON
     {
+        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON";
         Pos = MAP_APPFONT ( 12 , 6 ) ;
         Size = MAP_APPFONT ( 242 , 8 ) ;
         TabStop = TRUE ;
@@ -60,6 +61,7 @@ TabPage TP_LINENUMBERING
     };
     ListBox LB_CHAR_STYLE
     {
+        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE";
         Pos = MAP_APPFONT ( 100 , 30 ) ;
         Size = MAP_APPFONT ( 148 , 80 ) ;
         TabStop = TRUE ;
@@ -74,6 +76,7 @@ TabPage TP_LINENUMBERING
     };
     ListBox LB_FORMAT
     {
+        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_FORMAT";
         Pos = MAP_APPFONT ( 100 , 44 ) ;
         Size = MAP_APPFONT ( 148 , 80 ) ;
         TabStop = TRUE ;
@@ -87,6 +90,7 @@ TabPage TP_LINENUMBERING
     };
     ListBox LB_POS
     {
+        HelpID = "sw:ListBox:TP_LINENUMBERING:LB_POS";
         Pos = MAP_APPFONT ( 100 , 60 ) ;
         Size = MAP_APPFONT ( 148 , 60 ) ;
         TabStop = TRUE ;
@@ -107,6 +111,7 @@ TabPage TP_LINENUMBERING
     };
     MetricField MF_OFFSET
     {
+        HelpID = "sw:MetricField:TP_LINENUMBERING:MF_OFFSET";
         Pos = MAP_APPFONT ( 100 , 76 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE ;
@@ -130,6 +135,7 @@ TabPage TP_LINENUMBERING
     };
     NumericField NF_NUM_INVERVAL
     {
+        HelpID = "sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL";
         Pos = MAP_APPFONT ( 100 , 92 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -163,6 +169,7 @@ TabPage TP_LINENUMBERING
     };
     Edit ED_DIVISOR
     {
+        HelpID = "sw:Edit:TP_LINENUMBERING:ED_DIVISOR";
         Pos = MAP_APPFONT ( 45 , 121 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
         Left = TRUE ;
@@ -177,6 +184,7 @@ TabPage TP_LINENUMBERING
     };
     NumericField NF_DIV_INTERVAL
     {
+        HelpID = "sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL";
         Pos = MAP_APPFONT ( 45 , 137 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +213,7 @@ TabPage TP_LINENUMBERING
     };
     CheckBox CB_COUNT_EMPTYLINES
     {
+        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES";
         Pos = MAP_APPFONT ( 139 , 121 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -212,6 +221,7 @@ TabPage TP_LINENUMBERING
     };
     CheckBox CB_COUNT_FRAMELINES
     {
+        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES";
         Pos = MAP_APPFONT ( 139 , 135 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -219,6 +229,7 @@ TabPage TP_LINENUMBERING
     };
     CheckBox CB_RESTART_PAGE
     {
+        HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_RESTART_PAGE";
         Pos = MAP_APPFONT ( 139 , 149 );
         Size = MAP_APPFONT ( 110 , 10 );
         TabStop = TRUE;
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index 0fbc45eb1c..9bf1cf54f9 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -53,6 +53,7 @@ TabPage TP_NUM_POSITION
     };
     MultiListBox LB_LEVEL
     {
+        HelpID = "sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 26 , 163 ) ;
         TabStop = TRUE ;
@@ -75,6 +76,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_BORDERDIST
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -93,6 +95,7 @@ TabPage TP_NUM_POSITION
     };
     CheckBox CB_RELATIVE
     {
+        HelpID = "sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "Relati~ve" ;
@@ -105,6 +108,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_INDENT
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -129,6 +133,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_NUMDIST
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_NUMDIST";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -153,6 +158,7 @@ TabPage TP_NUM_POSITION
     };
     ListBox LB_ALIGN
     {
+        HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 40 ) ;
         TabStop = TRUE ;
@@ -172,6 +178,7 @@ TabPage TP_NUM_POSITION
     };
     ListBox LB_LABEL_FOLLOWED_BY
     {
+        HelpID = "sw:ListBox:TP_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -192,6 +199,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_LISTTAB
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_LISTTAB";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -215,6 +223,7 @@ TabPage TP_NUM_POSITION
     };
     ListBox LB_ALIGN_2
     {
+        HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN_2";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -228,6 +237,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_ALIGNED_AT
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_ALIGNED_AT";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -252,6 +262,7 @@ TabPage TP_NUM_POSITION
     };
     MetricField MF_INDENT_AT
     {
+        HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT_AT";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -270,6 +281,7 @@ TabPage TP_NUM_POSITION
     };
     PushButton PB_STANDARD
     {
+        HelpID = "sw:PushButton:TP_NUM_POSITION:PB_STANDARD";
         Pos = MAP_APPFONT ( 198 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Default" ;
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index 64dd97494a..f54025127d 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -65,6 +65,7 @@ ModalDialog DLG_NUM_NAMES
     };
     ListBox LB_FORM
     {
+        HelpID = "sw:ListBox:DLG_NUM_NAMES:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 29 ) ;
         Size = MAP_APPFONT ( 84 , 42 ) ;
@@ -85,6 +86,7 @@ ModalDialog DLG_NUM_NAMES
     };
     Edit ED_FORM
     {
+        HelpID = "sw:Edit:DLG_NUM_NAMES:ED_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 84 , 12 ) ;
@@ -211,6 +213,7 @@ TabPage TP_OUTLINE_NUM
         Hide = TRUE;
     ListBox LB_LEVEL
     {
+        HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 23 , 129 ) ;
         TabStop = TRUE ;
@@ -233,6 +236,7 @@ TabPage TP_OUTLINE_NUM
     };
     ListBox LB_COLL
     {
+        HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_COLL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 25 ) ;
         Size = MAP_APPFONT ( 120 , 75 ) ;
@@ -251,6 +255,7 @@ TabPage TP_OUTLINE_NUM
     };
     ListBox LB_NUMBER
     {
+        HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER";
         Pos = MAP_APPFONT ( 104 , 41 ) ;
         Size = MAP_APPFONT ( 66 , 65 ) ;
         TabStop = TRUE ;
@@ -266,6 +271,7 @@ TabPage TP_OUTLINE_NUM
     };
     ListBox LB_CHARFMT
     {
+        HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT";
         TabStop = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 104 , 57 ) ;
@@ -279,6 +285,7 @@ TabPage TP_OUTLINE_NUM
     };
     NumericField NF_ALL_LEVEL
     {
+        HelpID = "sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 104 , 73 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
@@ -308,6 +315,7 @@ TabPage TP_OUTLINE_NUM
     };
     Edit ED_PREFIX
     {
+        HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 104 , 100 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
@@ -324,6 +332,7 @@ TabPage TP_OUTLINE_NUM
     };
     Edit ED_SUFFIX
     {
+        HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 104 , 115 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
@@ -340,6 +349,7 @@ TabPage TP_OUTLINE_NUM
     };
     NumericField ED_START
     {
+        HelpID = "sw:NumericField:TP_OUTLINE_NUM:ED_START";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 104 , 131 ) ;
         Size = MAP_APPFONT ( 66 , 12 ) ;
diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src
index 18acc28267..eebc13ca5d 100644
--- a/sw/source/ui/misc/pgfnote.src
+++ b/sw/source/ui/misc/pgfnote.src
@@ -35,6 +35,7 @@ TabPage TP_FOOTNOTE_PAGE
     Hide = TRUE;
     RadioButton RB_MAXHEIGHT_PAGE
     {
+        HelpID = "sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 132 , 10 ) ;
         Text [ en-US ] = "~Not larger than page area" ;
@@ -43,12 +44,14 @@ TabPage TP_FOOTNOTE_PAGE
     };
     RadioButton RB_MAXHEIGHT
     {
+        HelpID = "sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 132 , 10 ) ;
         Text [ en-US ] = "Maximum footnote ~height" ;
     };
     MetricField ED_MAXHEIGHT
     {
+        HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 148 , 26 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -75,6 +78,7 @@ TabPage TP_FOOTNOTE_PAGE
     };
     MetricField ED_DIST
     {
+        HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 148 , 42 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -105,6 +109,7 @@ TabPage TP_FOOTNOTE_PAGE
     };
     ListBox DLB_LINEPOS
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS";
         Pos = MAP_APPFONT ( 148 , 71 ) ;
         Size = MAP_APPFONT ( 57 , 40 ) ;
         TabStop = TRUE ;
@@ -128,6 +133,7 @@ TabPage TP_FOOTNOTE_PAGE
     };
     ListBox DLB_LINETYPE
     {
+        HelpID = "sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE";
         Pos = MAP_APPFONT ( 148 , 87 ) ;
         Size = MAP_APPFONT ( 57 , 50 ) ;
         TabStop = TRUE ;
@@ -145,6 +151,7 @@ TabPage TP_FOOTNOTE_PAGE
     };
     MetricField ED_LINEWIDTH
     {
+        HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 148 , 103 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -168,6 +175,7 @@ TabPage TP_FOOTNOTE_PAGE
     };
     MetricField ED_LINEDIST
     {
+        HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 148 , 119 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src
index 76bd70201d..a39ca828f9 100644
--- a/sw/source/ui/misc/pggrid.src
+++ b/sw/source/ui/misc/pggrid.src
@@ -41,24 +41,28 @@ TabPage TP_TEXTGRID_PAGE
     };
     RadioButton     RB_NOGRID
     {
+        HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 158 , 10 ) ;
         Text [ en-US ] = "No grid" ;
     };
     RadioButton     RB_LINESGRID
     {
+        HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 158 , 10 ) ;
         Text [ en-US ] = "Grid (lines only)" ;
     };
     RadioButton     RB_CHARSGRID
     {
+        HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 158 , 10 ) ;
         Text [ en-US ] = "Grid (lines and characters)" ;
     };
     CheckBox        CB_SNAPTOCHARS
     {
+        HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_SNAPTOCHARS";
         Pos = MAP_APPFONT ( 14 , 53 ) ;
         Size = MAP_APPFONT ( 158 , 10 ) ;
         Text [ en-US ] = "~Snap to characters" ;
@@ -83,6 +87,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     NumericField    NF_LINESPERPAGE
     {
+        HelpID = "sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE";
         Pos = MAP_APPFONT ( 74 , 80 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE ;
@@ -105,6 +110,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     MetricField     MF_TEXTSIZE
     {
+        HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE";
         Pos = MAP_APPFONT ( 216 , 80 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
         Border = TRUE ;
@@ -128,6 +134,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     NumericField    NF_CHARSPERLINE
     {
+        HelpID = "sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE";
         Pos = MAP_APPFONT ( 74 , 96 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
         Border = TRUE ;
@@ -151,6 +158,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     MetricField     MF_CHARWIDTH
     {
+        HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_CHARWIDTH";
         Pos = MAP_APPFONT ( 216 , 96 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
         Border = TRUE ;
@@ -174,6 +182,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     MetricField     MF_RUBYSIZE
     {
+        HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE";
         Pos = MAP_APPFONT ( 216 , 96 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
         Border = TRUE ;
@@ -191,6 +200,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     CheckBox        CB_RUBYBELOW
     {
+        HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW";
         Pos = MAP_APPFONT ( 14 , 112 ) ;
         Size = MAP_APPFONT ( 237 , 10 ) ;
         Text [ en-US ] = "Ruby text below/left from base text" ;
@@ -203,12 +213,14 @@ TabPage TP_TEXTGRID_PAGE
     };
     CheckBox        CB_DISPLAY
     {
+        HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Display grid" ;
     };
     CheckBox        CB_PRINT
     {
+        HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT";
         Pos = MAP_APPFONT ( 18 , 154 ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Text [ en-US ] = "Print grid" ;
@@ -221,6 +233,7 @@ TabPage TP_TEXTGRID_PAGE
     };
     ListBox         LB_COLOR
     {
+        HelpID = "sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR";
         Pos = MAP_APPFONT ( 191 , 137 ) ;
         Size = MAP_APPFONT ( 60 , 50 ) ;
         TabStop = TRUE;
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index e2b7e6a151..2947edfcee 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -273,7 +273,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) :
 
     pActLB->SelectEntryPos(0);
 
-    pTable->SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+    pTable->SetStyle(pTable->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
     pTable->SetNodeDefaultImages();
     pTable->SetSelectionMode(MULTIPLE_SELECTION);
     pTable->SetHighlightRange(1);
diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src
index 8a1eb3a3ee..ddacdac459 100644
--- a/sw/source/ui/misc/srtdlg.src
+++ b/sw/source/ui/misc/srtdlg.src
@@ -32,7 +32,7 @@
 
 ModalDialog DLG_SORTING
 {
-    HelpID = FN_SORTING_DLG ;
+    HelpID = CMD_FN_SORTING_DLG ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 268 , 193 ) ;
@@ -80,6 +80,7 @@ ModalDialog DLG_SORTING
     };
     CheckBox CB_KEY1
     {
+        HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY1";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 49 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~1 : Schl³ssel ~1 */
@@ -88,6 +89,7 @@ ModalDialog DLG_SORTING
     };
     NumericField ED_KEY1
     {
+        HelpID = "sw:NumericField:DLG_SORTING:ED_KEY1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 23 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -109,6 +111,7 @@ ModalDialog DLG_SORTING
     };
     ListBox DLB_KEY1
     {
+        HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY1";
         Pos = MAP_APPFONT ( 96 , 23 ) ;
         Size = MAP_APPFONT ( 55 , 45 ) ;
         TabStop = TRUE ;
@@ -118,6 +121,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_UP
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_UP";
         Pos = MAP_APPFONT ( 155 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Ascending" ;
@@ -126,6 +130,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_DN
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_DN";
         Pos = MAP_APPFONT ( 155 , 35 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Descending" ;
@@ -133,6 +138,7 @@ ModalDialog DLG_SORTING
     };
     CheckBox CB_KEY2
     {
+        HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY2";
         Pos = MAP_APPFONT ( 12 , 52 ) ;
         Size = MAP_APPFONT ( 49 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~2 : Schl³ssel ~2 */
@@ -140,6 +146,7 @@ ModalDialog DLG_SORTING
     };
     NumericField ED_KEY2
     {
+        HelpID = "sw:NumericField:DLG_SORTING:ED_KEY2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 50 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -156,6 +163,7 @@ ModalDialog DLG_SORTING
     };
     ListBox DLB_KEY2
     {
+        HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY2";
         Pos = MAP_APPFONT ( 96 , 50 ) ;
         Size = MAP_APPFONT ( 55 , 45 ) ;
         TabStop = TRUE ;
@@ -165,6 +173,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_UP2
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_UP2";
         Pos = MAP_APPFONT ( 155 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Ascending" ;
@@ -173,6 +182,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_DN2
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_DN2";
         Pos = MAP_APPFONT ( 155 , 62 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Descending" ;
@@ -180,6 +190,7 @@ ModalDialog DLG_SORTING
     };
     CheckBox CB_KEY3
     {
+        HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY3";
         Pos = MAP_APPFONT ( 12 , 81 ) ;
         Size = MAP_APPFONT ( 49 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~3 : Schl³ssel ~3 */
@@ -187,6 +198,7 @@ ModalDialog DLG_SORTING
     };
     NumericField ED_KEY3
     {
+        HelpID = "sw:NumericField:DLG_SORTING:ED_KEY3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 79 ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -203,6 +215,7 @@ ModalDialog DLG_SORTING
     };
     ListBox DLB_KEY3
     {
+        HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY3";
         Pos = MAP_APPFONT ( 96 , 79 ) ;
         Size = MAP_APPFONT ( 55 , 45 ) ;
         TabStop = TRUE ;
@@ -212,6 +225,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_UP3
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_UP3";
         Pos = MAP_APPFONT ( 155 , 79 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Ascending" ;
@@ -220,6 +234,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_DN3
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_DN3";
         Pos = MAP_APPFONT ( 155 , 91 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Descending" ;
@@ -233,6 +248,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_COL
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_COL";
         Pos = MAP_APPFONT ( 12 , 120 ) ;
         Size = MAP_APPFONT ( 38 , 10 ) ;
         Text [ en-US ] = "Col~umns" ;
@@ -240,6 +256,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_ROW
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_ROW";
         Pos = MAP_APPFONT ( 12 , 133 ) ;
         Size = MAP_APPFONT ( 34 , 10 ) ;
         Text [ en-US ] = "~Rows" ;
@@ -254,6 +271,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_TAB
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_TAB";
         Pos = MAP_APPFONT ( 113 , 120 ) ;
         Size = MAP_APPFONT ( 44 , 9 ) ;
         Text [ en-US ] = "~Tabs" ;
@@ -262,6 +280,7 @@ ModalDialog DLG_SORTING
     };
     RadioButton RB_TABCH
     {
+        HelpID = "sw:RadioButton:DLG_SORTING:RB_TABCH";
         Pos = MAP_APPFONT ( 113 , 133 ) ;
         Size = MAP_APPFONT ( 38 , 10 ) ;
         Text [ en-US ] = "~Character" ;
@@ -269,6 +288,7 @@ ModalDialog DLG_SORTING
     };
     Edit ED_TABCH
     {
+        HelpID = "sw:Edit:DLG_SORTING:ED_TABCH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 180 , 133 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
@@ -291,6 +311,7 @@ ModalDialog DLG_SORTING
     };
     PushButton PB_DELIM
     {
+        HelpID = "sw:PushButton:DLG_SORTING:PB_DELIM";
         Pos = MAP_APPFONT ( 195 , 133 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = TRUE ;
@@ -304,6 +325,7 @@ ModalDialog DLG_SORTING
     };
     ListBox LB_LANG
     {
+        HelpID = "sw:ListBox:DLG_SORTING:LB_LANG";
         Pos = MAP_APPFONT ( 12 , 158 ) ;
         Size = MAP_APPFONT ( 83 , 61 ) ;
         TabStop = TRUE ;
@@ -318,6 +340,7 @@ ModalDialog DLG_SORTING
     };
     CheckBox CB_CASE
     {
+        HelpID = "sw:CheckBox:DLG_SORTING:CB_CASE";
         Pos = MAP_APPFONT ( 113 , 159 ) ;
         Size = MAP_APPFONT ( 147 , 10 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src
index e8f8fa58f5..24ae9a48bc 100644
--- a/sw/source/ui/ribbar/inputwin.src
+++ b/sw/source/ui/ribbar/inputwin.src
@@ -44,7 +44,7 @@ ToolBox RID_TBX_FORMULA
         ToolBoxItem
         {
             Identifier = FN_FORMULA_CALC ;
-            HelpID = FN_FORMULA_CALC ;
+            HelpId = HID_TBX_FORMULA_CALC ;
             DropDown = TRUE ;
             Text [ en-US ] = "Formula" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel auswählen : Formel auswõhlen */
@@ -52,14 +52,14 @@ ToolBox RID_TBX_FORMULA
         ToolBoxItem
         {
             Identifier = FN_FORMULA_CANCEL ;
-            HelpID = FN_FORMULA_CANCEL ;
+            HelpId = HID_TBX_FORMULA_CANCEL ;
             Text [ en-US ] = "Cancel" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel nicht übenehmen : Formel nicht ³benehmen */
         };
         ToolBoxItem
         {
             Identifier = FN_FORMULA_APPLY ;
-            HelpID = FN_FORMULA_APPLY ;
+            HelpId = HID_TBX_FORMULA_APPLY ;
             /* ### ACHTUNG: Neuer Text in Resource? Übernehmen : šbernehmen */
             Text [ en-US ] = "Apply" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel einfügen : Formel einf³gen */
@@ -287,21 +287,21 @@ String STR_TBL_FORMULA
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_CALC ; \
-        HelpID = FN_FORMULA_CALC ; \
+        HelpID = HID_TBX_FORMULA_CALC ; \
         Text [ en-US ] = "Formula" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel auswählen : Formel auswõhlen */\
     };\
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_CANCEL ; \
-        HelpID = FN_FORMULA_CANCEL ; \
+        HelpId = HID_TBX_FORMULA_CANCEL ; \
         Text [ en-US ] = "Cancel" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel nicht übenehmen : Formel nicht ³benehmen */\
     };\
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_APPLY ; \
-        HelpID = FN_FORMULA_APPLY ; \
+        HelpID = HID_TBX_FORMULA_APPLY ; \
         /* ### ACHTUNG: Neuer Text in Resource? Übernehmen : šbernehmen */\
         Text [ en-US ] = "Apply" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel einfügen : Formel einf³gen */\
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 2405d4b16d..2adb59eec1 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -42,7 +42,6 @@ SRS1NAME=$(TARGET)
 SRC1FILES =  \
         tbxanchr.src \
         inputwin.src \
-        tblctrl.src \
         workctrl.src
 
 EXCEPTIONSFILES = \
diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src
deleted file mode 100644
index afc5949983..0000000000
--- a/sw/source/ui/ribbar/tblctrl.src
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "tblctrl.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-FloatingWindow RID_TBL_OPT_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_TBL_OPT_CTRL ;
-    ToolBox TBX_OPTIMIZE_TABLE
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_BALANCE_CELLS ;
-                HelpID = FN_TABLE_BALANCE_CELLS ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_BALANCE_ROWS ;
-                HelpID = FN_TABLE_BALANCE_ROWS ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_OPTIMAL_HEIGHT ;
-                HelpID = FN_TABLE_OPTIMAL_HEIGHT ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_ADJUST_CELLS ;
-                HelpID = FN_TABLE_ADJUST_CELLS ;
-            };
-        };
-    };
-    Text [ en-US ] = "Optimize" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index bb69819b8d..313265e853 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -454,7 +454,7 @@ static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
     NID_TABLE_FORMULA_ERROR,
     NID_NEXT
 };
-static USHORT __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] =
+static const char* __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] =
 {
     // -- first line
     HID_NID_TBL,
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index c50da95313..3cb93cb585 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -32,138 +32,9 @@
 #include <svx/globlmn.hrc>
 #endif
 #include "workctrl.hrc"
-#include "workctrl.hrc"
 #include "helpid.h"
 #include "cmdid.h"
-FloatingWindow RID_INSERT_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_INSERT_CTRL ;
-    /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */
-    ToolBox TBX_INSERT
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FRAME_INTERACT_NOCOL ;
-                HelpID = FN_INSERT_FRAME_INTERACT_NOCOL ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FRAME_INTERACT ;
-                HelpID = FN_INSERT_FRAME_INTERACT ;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_GRAPHIC ;
-                HelpID = SID_INSERT_GRAPHIC ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_TABLE ;
-                HelpID = FN_INSERT_TABLE ;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERTDOC ;
-                HelpID = SID_INSERTDOC ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FOOTNOTE ;
-                HelpID = FN_INSERT_FOOTNOTE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_ENDNOTE ;
-                HelpID = FN_INSERT_ENDNOTE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_SYMBOL ;
-                HelpID = FN_INSERT_SYMBOL ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_REGION ;
-                HelpID = FN_INSERT_REGION;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_IDX_ENTRY_DLG ;
-                HelpID = FN_INSERT_IDX_ENTRY_DLG ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_BOOKMARK ;
-                HelpID = FN_INSERT_BOOKMARK ;
-                RadioCheck = TRUE ;
-            };
-        };
-    };
-    Text [ en-US ] = "Insert" ;
-};
-FloatingWindow RID_INSERT_OBJ_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_INSERT_OBJ_CTRL ;
-    /* ### ACHTUNG: Neuer Text in Resource? Objekt einfügen : Objekt einf³gen */
-    ToolBox TBX_OBJ_INSERT
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_DIAGRAM ;
-                HelpID = SID_INSERT_DIAGRAM ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_SMA ;
-                HelpID = FN_INSERT_SMA ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_FLOATINGFRAME ;
-                HelpID = SID_INSERT_FLOATINGFRAME ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_OBJECT ;
-                HelpID = SID_INSERT_OBJECT ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_PLUGIN ;
-                HelpID = SID_INSERT_PLUGIN ;
-            };
-#ifdef SOLAR_JAVA
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_APPLET ;
-                HelpID = SID_INSERT_APPLET ;
-            };
-#endif
-        };
-    };
-    Text [ en-US ] = "Insert Object" ;
-};
+
 Menu RID_INSERT_FIELD_CTRL
 {
     ItemList =
@@ -171,45 +42,45 @@ Menu RID_INSERT_FIELD_CTRL
         MenuItem
         {
             Identifier = FN_INSERT_FLD_DATE ;
-            HelpID = FN_INSERT_FLD_DATE ;
+            HelpId = CMD_FN_INSERT_FLD_DATE ;
             Text [ en-US ] = "Date" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TIME ;
-            HelpID = FN_INSERT_FLD_TIME ;
+            HelpId = CMD_FN_INSERT_FLD_TIME ;
             Text [ en-US ] = "Time" ;
         };
          //#ifndef MN_SW_WEB
         MenuItem
         {
             Identifier = FN_INSERT_FLD_PGNUMBER ;
-            HelpID = FN_INSERT_FLD_PGNUMBER ;
+            HelpId = CMD_FN_INSERT_FLD_PGNUMBER ;
             Text [ en-US ] = "Page Number" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_PGCOUNT ;
-            HelpID = FN_INSERT_FLD_PGCOUNT ;
+            HelpId = CMD_FN_INSERT_FLD_PGCOUNT ;
             Text [ en-US ] = "Page Count" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TOPIC ;
-            HelpID = FN_INSERT_FLD_TOPIC ;
+            HelpId = CMD_FN_INSERT_FLD_TOPIC ;
             Text [ en-US ] = "Subject" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TITLE ;
-            HelpID = FN_INSERT_FLD_TITLE ;
+            HelpId = CMD_FN_INSERT_FLD_TITLE ;
             Text [ en-US ] = "Title" ;
         };
          //#endif
         MenuItem
         {
             Identifier = FN_INSERT_FLD_AUTHOR ;
-            HelpID = FN_INSERT_FLD_AUTHOR ;
+            HelpId = CMD_FN_INSERT_FLD_AUTHOR ;
             Text [ en-US ] = "Author" ;
         };
         MenuItem
@@ -219,7 +90,7 @@ Menu RID_INSERT_FIELD_CTRL
         MenuItem
         {
             Identifier = FN_INSERT_FIELD ;
-            HelpID = FN_INSERT_FIELD ;
+            HelpId = CMD_FN_INSERT_FIELD ;
             Text [ en-US ] = "Other..." ;
         };
     };
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 3486fd06a8..bd465c6dd1 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1010,7 +1010,6 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq)
         case FN_REPLY:
         case FN_POSTIT:
         case FN_DELETE_COMMENT:
-        case FN_DELETE_NOTE:
             if ( pPostItMgr->HasActiveSidebarWin() )
                 pPostItMgr->GetActiveSidebarWin()->ExecuteCommand(nSlot);
             break;
@@ -1058,24 +1057,15 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
         switch( nSlotId )
         {
             case FN_POSTIT:
-            case FN_DELETE_NOTE:
             case FN_DELETE_NOTE_AUTHOR:
             case FN_DELETE_ALL_NOTES:
             case FN_HIDE_NOTE:
             case FN_HIDE_NOTE_AUTHOR:
             case FN_HIDE_ALL_NOTES:
-            {
-                if ( !pPostItMgr ||
-                     !pPostItMgr->HasActiveAnnotationWin() )
-                {
-                    rSet.DisableItem(nWhich);
-                }
-                break;
-            }
             case FN_DELETE_COMMENT:
             {
                 if ( !pPostItMgr ||
-                     !pPostItMgr->HasActiveSidebarWin() /*HasActiveRedCommentWin()*/ )
+                     !pPostItMgr->HasActiveAnnotationWin() )
                 {
                     rSet.DisableItem(nWhich);
                 }
@@ -1108,7 +1098,7 @@ void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
         if (pPostItMgr->HasActiveSidebarWin())
         {
             if ( (pPostItMgr->GetActiveSidebarWin()->IsProtected()) &&
-                    ( (nSlotId==FN_DELETE_NOTE) || (nSlotId==FN_REPLY) ) )
+                    ( (nSlotId==FN_DELETE_COMMENT) || (nSlotId==FN_REPLY) ) )
                 rSet.DisableItem( nWhich );
         }
         nWhich = aIter.NextWhich();
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 025403cc08..ee845c932b 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1080,6 +1080,14 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 rSh.SetFlyFrmAttr(aSet);
             }
 
+            // if new anchor is 'as char' and it is a Math object and the usual 
+            // pre-conditions are met then align the formula to the baseline of the text
+            const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() );
+            const bool bDoMathBaselineAlignment = xObj.is() && SotExchange::IsMath( xObj->getClassID() )
+                    && FLY_AS_CHAR == eSet && rSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+            if (bDoMathBaselineAlignment) 
+                rSh.AlignFormulaToBaseline( xObj );
+
             USHORT nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
             if( nHtmlMode )
             {
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index b2dfee2fa4..66043b2eb5 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -52,7 +52,7 @@
 #include <vcl/msgbox.hxx>
 // <--
 
-
+#include <doc.hxx>
 #include <fmturl.hxx>
 #include <fmtclds.hxx>
 #include <fmtcnct.hxx>
@@ -78,6 +78,7 @@
 
 #include <helpid.h>
 #include <cmdid.h>
+#include <cfgitems.hxx>
 #include <globals.hrc>
 #include <popup.hrc>
 #include <shells.hrc>
@@ -408,14 +409,13 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                                             SID_HTML_MODE, 			SID_HTML_MODE,
                                             FN_SET_FRM_ALT_NAME, 	FN_SET_FRM_ALT_NAME,
                                             FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT,
+                                            FN_OLE_IS_MATH,         FN_OLE_IS_MATH,
+                                            FN_MATH_BASELINE_ALIGNMENT, FN_MATH_BASELINE_ALIGNMENT,
                                             0);
 
                 const SwViewOption* pVOpt = rSh.GetViewOptions();
                 if(nSel & nsSelectionType::SEL_OLE)
-                {
-                    aSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO,
-                        pVOpt->IsKeepRatio()));
-                }
+                    aSet.Put( SfxBoolItem(FN_KEEP_ASPECT_RATIO, pVOpt->IsKeepRatio()) );
                 aSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
                 aSet.Put(SfxStringItem(FN_SET_FRM_NAME, rSh.GetFlyName()));
                 if( nSel & nsSelectionType::SEL_OLE )
@@ -446,6 +446,12 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != 0xff)
                     rSize.SetHeight(rSh.GetAnyCurRect(RECT_FLY_EMBEDDED).Height());
 
+                // disable vertical positioning for Math Objects anchored 'as char' if baseline alignment is activated
+                aSet.Put( SfxBoolItem( FN_MATH_BASELINE_ALIGNMENT, 
+                        rSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) );
+                const uno::Reference < embed::XEmbeddedObject > xObj( rSh.GetOleRef() );
+                aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) );
+
                 UINT16 nDefPage = 0;
                 if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, FALSE, &pItem) == SFX_ITEM_SET)
                     nDefPage = ((SfxUInt16Item *)pItem)->GetValue();
@@ -1146,3 +1152,4 @@ void  SwFrameShell::StateInsert(SfxItemSet &rSet)
     if ((nSel & nsSelectionType::SEL_GRF) || (nSel & nsSelectionType::SEL_OLE))
         rSet.DisableItem(FN_INSERT_FRAME);
 }
+
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 42b3b0029a..76b4580800 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -156,880 +156,46 @@ String RID_TEXT_TOOLBOX
         Text [ en-US ] = "Text Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_TEXT_TOOLBOX
-{
-    HelpID = HID_TEXT_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    LineSpacing = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        MN_TEXT1(TRUE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LTR_RTL
-        MN_TEXT_LINESPACE
-        MN_TEXT2
-        MN_TEXT_BACKGROUND
-        MN_TEXT_DIALOGS(TRUE)
-    };
-    Scroll = TRUE ;
-};
 String RID_TABLE_TOOLBOX
 {
         Text [ en-US ] = "Table Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_TABLE_TOOLBOX
-{
-    HelpID = HID_TABLE_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    Scroll = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_AUTOSUM ;
-            HelpID = FN_TABLE_AUTOSUM ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_FIX ;
-            HelpID = FN_TABLE_MODE_FIX ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_FIX_PROP ;
-            HelpID = FN_TABLE_MODE_FIX_PROP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_VARIABLE ;
-            HelpID = FN_TABLE_MODE_VARIABLE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MERGE_CELLS ;
-            HelpID = FN_TABLE_MERGE_CELLS ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SPLIT_CELLS ;
-            HelpID = FN_TABLE_SPLIT_CELLS ;
-        };
-        ToolBoxItem
-        {
-            DropDown = TRUE ;
-            Identifier = FN_OPTIMIZE_TABLE ;
-            HelpID = FN_OPTIMIZE_TABLE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_INSERT_ROW ;
-            HelpID = FN_TABLE_INSERT_ROW ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_INSERT_COL ;
-            HelpID = FN_TABLE_INSERT_COL ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_DELETE_ROW ;
-            HelpID = FN_TABLE_DELETE_ROW ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_DELETE_COL ;
-            HelpID = FN_TABLE_DELETE_COL ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_ALL;
-            HelpID = FN_TABLE_SELECT_ALL;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_COL;
-            HelpID = FN_TABLE_SELECT_COL;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_ROW;
-            HelpID = FN_TABLE_SELECT_ROW;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_NONE;
-            HelpID = FN_TABLE_VERT_NONE;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_CENTER;
-            HelpID = FN_TABLE_VERT_CENTER;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_BOTTOM;
-            HelpID = FN_TABLE_VERT_BOTTOM;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_BORDER
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_FRAME_LINESTYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_FRAME_LINECOLOR
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_BACKGROUND_COLOR
-        };
-    };
-};
 String RID_FRAME_TOOLBOX
 {
         Text [ en-US ] = "Frame Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_FRAME_TOOLBOX
-{
-    HelpID = HID_FRAME_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    MenuStrings = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FRAME_WRAP
-        MN_FRAME1
-        MN_FRAME2
-        MN_FRAME3
-        MN_LINESTYLE
-        MN_BACKGROUND_COLOR
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_FRAME
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_CHAIN ;
-            HelpID = FN_FRAME_CHAIN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_UNCHAIN ;
-            HelpID = FN_FRAME_UNCHAIN ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_GRAFIK_TOOLBOX
 {
         Text [ en-US ] = "Graphics Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_GRAFIK_TOOLBOX
-{
-    HelpID = HID_GRAFIK_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    MenuStrings = TRUE ;
-    Customize = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_GRFFILTER;
-            HelpID = SID_GRFFILTER;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_MODE;
-            HelpID = SID_ATTR_GRAF_MODE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_RED;
-            HelpID = SID_ATTR_GRAF_RED;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_GREEN;
-            HelpID = SID_ATTR_GRAF_GREEN;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_BLUE;
-            HelpID = SID_ATTR_GRAF_BLUE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_LUMINANCE;
-            HelpID = SID_ATTR_GRAF_LUMINANCE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_CONTRAST;
-            HelpID = SID_ATTR_GRAF_CONTRAST;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_GAMMA;
-            HelpID = SID_ATTR_GRAF_GAMMA;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_TRANSPARENCE;
-            HelpID = SID_ATTR_GRAF_TRANSPARENCE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = FN_FLIP_VERT_GRAFIC ;
-            HelpID = FN_FLIP_VERT_GRAFIC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FLIP_HORZ_GRAFIC ;
-            HelpID = FN_FLIP_HORZ_GRAFIC ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_GRAFIK
-    };
-    Scroll = TRUE ;
-};
 String RID_OLE_TOOLBOX
 {
         Text [ en-US ] = "Object" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_OLE_TOOLBOX
-{
-    HelpID = HID_OLE_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    Scroll = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FRAME_WRAP
-        MN_CONTOUR
-        MN_FRAME1
-        MN_FRAME2
-        MN_FRAME3
-        MN_LINESTYLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_OLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-    };
-};
 String RID_DRAW_TOOLBOX
 {
         Text [ en-US ] = "Draw Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_DRAW_TOOLBOX
-{
-    HelpID = HID_DRAW_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDIT ;
-            HelpID = SID_BEZIER_EDIT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTRIBUTES_LINE ;
-            HelpID = SID_ATTRIBUTES_LINE ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINEEND_STYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_STYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_WIDTH
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_COLOR
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTRIBUTES_AREA ;
-            HelpID = SID_ATTRIBUTES_AREA ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_FILL_STYLE
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_OBJECT_ROTATE
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_NOWRAP ;
-            HelpID = FN_FRAME_NOWRAP ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP ;
-            HelpID = FN_FRAME_WRAP ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_IDEAL ;
-            HelpID = FN_FRAME_WRAP_IDEAL ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_LEFT ;
-            HelpID = FN_FRAME_WRAP_LEFT ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_RIGHT ;
-            HelpID = FN_FRAME_WRAP_RIGHT ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAPTHRU ;
-            HelpID = FN_FRAME_WRAPTHRU ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_CONTOUR ;
-            HelpID = FN_FRAME_WRAP_CONTOUR ;
-            Hide = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_HEAVEN ;
-            HelpID = SID_OBJECT_HEAVEN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_HELL ;
-            HelpID = SID_OBJECT_HELL ;
-        };
-        MN_LAYER
-        MN_GRID( HIDE=TRUE )
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_ALIGN ;
-            HelpID = SID_OBJECT_ALIGN ;
-            DropDown = TRUE ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_BEZIER_TOOLBOX
 {
         Text [ en-US ] = "Bézier Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_BEZIER_TOOLBOX
-{
-    HelpID = HID_BEZIER_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDIT ;
-            HelpID = SID_BEZIER_EDIT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_MOVE ;
-            HelpID = SID_BEZIER_MOVE ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_INSERT ;
-            HelpID = SID_BEZIER_INSERT ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_DELETE ;
-            HelpID = SID_BEZIER_DELETE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CUTLINE ;
-            HelpID = SID_BEZIER_CUTLINE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CONVERT ;
-            HelpID = SID_BEZIER_CONVERT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDGE ;
-            HelpID = SID_BEZIER_EDGE ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_SMOOTH ;
-            HelpID = SID_BEZIER_SMOOTH ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_SYMMTR ;
-            HelpID = SID_BEZIER_SYMMTR ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CLOSE ;
-            HelpID = SID_BEZIER_CLOSE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_ELIMINATE_POINTS ;
-            HelpID = SID_BEZIER_ELIMINATE_POINTS ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_DRAW_TEXT_TOOLBOX
 {
     Text [ en-US ] = "Text Object Bar/Graphics" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_DRAW_TEXT_TOOLBOX
-{
-    HelpID = HID_DRAW_TEXT_TOOLBOX ;
-    Border = TRUE ;
-    Customize = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_FONT
-        MN_TEXT1(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_LTR_RTL
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    ItemList[ ar ] =
-    {
-        MN_FONT
-        MN_TEXT1_RTL(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_RTL_LTR
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    ItemList[ he ] =
-    {
-        MN_FONT
-        MN_TEXT1_RTL(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_RTL_LTR
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    Scroll = TRUE ;
-};
 String RID_NUM_TOOLBOX
 {
         Text [ en-US ] = "Numbering Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_NUM_TOOLBOX
-{
-    HelpID = HID_NUM_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OFF ;
-            HelpID = FN_NUM_BULLET_OFF ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_UP ;
-            HelpID = FN_NUM_BULLET_UP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_DOWN ;
-            HelpID = FN_NUM_BULLET_DOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_UP ;
-            HelpID = FN_NUM_BULLET_OUTLINE_UP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_DOWN ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_NONUM ;
-            HelpID = FN_NUM_BULLET_NONUM ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_MOVEUP ;
-            HelpID = FN_NUM_BULLET_MOVEUP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_MOVEDOWN ;
-            HelpID = FN_NUM_BULLET_MOVEDOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_MOVEUP ;
-            HelpID = FN_NUM_BULLET_OUTLINE_MOVEUP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_MOVEDOWN ;
-            HelpID = FN_NUM_BULLET_OUTLINE_MOVEDOWN ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUMBER_NEWSTART ;
-            HelpID = FN_NUMBER_NEWSTART ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUMBER_BULLETS ;
-            HelpID = FN_NUMBER_BULLETS ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String STR_SHELLNAME_TEXT
 {
         Text [ en-US ] = "Text" ;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 3e17c83893..486737089d 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -961,10 +961,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_INSERT_COL_DLG:
         case FN_TABLE_INSERT_ROW_DLG:
         {
+            const SfxSlot* pSlot = GetStaticInterface()->GetSlot(nSlot);
             if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline())
             {
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, nSlot) : 0);
+                ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
 
                 if( pDlg.get() && (pDlg->Execute() == 1) )
                 {
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 7bef6d5265..1c1efba2cd 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -313,7 +313,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 rReq.Ignore();
             }
             break;
-            case FN_DELETE_NOTE:
+            case FN_DELETE_COMMENT:
                 if ( GetView().GetPostItMgr() &&
                      GetView().GetPostItMgr()->HasActiveSidebarWin() )
                 {
@@ -622,7 +622,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
     {
         switch (nWhich)
         {
-            case FN_DELETE_NOTE:
+            case FN_DELETE_COMMENT:
             case FN_DELETE_NOTE_AUTHOR:
             case FN_DELETE_ALL_NOTES:
             case FN_HIDE_NOTE:
@@ -634,7 +634,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
                         rSet.InvalidateItem( nWhich );
                     else if ( !pPostItMgr->HasActiveSidebarWin() )
                     {
-                        rSet.InvalidateItem( FN_DELETE_NOTE );
+                        rSet.InvalidateItem( FN_DELETE_COMMENT );
                         rSet.InvalidateItem( FN_HIDE_NOTE );
                     }
                 }
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index e437de58d4..0326473a08 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -282,7 +282,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
     break;
     case SID_INSERT_OBJECT:
     case SID_INSERT_PLUGIN:
-    case SID_INSERT_APPLET:
     {
         SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False );
         SvGlobalName *pName = NULL;
@@ -293,18 +292,13 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             pName = &aName;
         }
 
-        SFX_REQUEST_ARG( rReq, pClassItem,          SfxStringItem, FN_PARAM_1, sal_False );
         SFX_REQUEST_ARG( rReq, pClassLocationItem,  SfxStringItem, FN_PARAM_2, sal_False );
         SFX_REQUEST_ARG( rReq, pCommandsItem,       SfxStringItem, FN_PARAM_3, sal_False );
         //TODO/LATER: recording currently not working, need code for Commandlist
         svt::EmbeddedObjectRef xObj;
-        if((SID_INSERT_APPLET == nSlot || SID_INSERT_PLUGIN)
-                && (pClassItem || pClassLocationItem || pCommandsItem))
+        if( nSlot == SID_INSERT_PLUGIN && ( pClassLocationItem || pCommandsItem ) )
         {
-            String sClass;
             String sClassLocation;
-            if(pClassItem)
-                sClass = pClassItem->GetValue();
             if(pClassLocationItem)
                 sClassLocation = pClassLocationItem->GetValue();
 
@@ -315,36 +309,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 aCommandList.AppendCommands( pCommandsItem->GetValue(), &nTemp );
             }
 
-            if(SID_INSERT_APPLET == nSlot)
-            {
-                SwApplet_Impl aApplImpl( rSh.GetAttrPool(),
-                                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
-                String sBaseURL;
-                SfxMedium* pMedium = GetView().GetDocShell()->GetMedium();
-                if(pMedium)
-                    sBaseURL = pMedium->GetURLObject().GetMainURL(INetURLObject::NO_DECODE);
-
-                aApplImpl.CreateApplet(sClass, aEmptyStr, FALSE, sClassLocation, sBaseURL );
-                aApplImpl.FinishApplet();
-                xObj.Assign( aApplImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT );
-                if( aCommandList.Count() )
-                {
-                    uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
-                    if ( xSet.is() )
-                    {
-                        uno::Sequence < beans::PropertyValue > aSeq;
-                        aCommandList.FillSequence( aSeq );
-                        try
-                        {
-                            xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), uno::makeAny( aSeq ) );
-                        }
-                        catch ( uno::Exception& )
-                        {
-                        }
-                    }
-                }
-            }
-            else
             {
                 comphelper::EmbeddedObjectContainer aCnt;
                 ::rtl::OUString sName;
@@ -851,13 +815,8 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
             case SID_INSERT_FLOATINGFRAME:
             case SID_INSERT_OBJECT:
             case SID_INSERT_PLUGIN:
-            case SID_INSERT_APPLET:
             {
-                if(
-#ifndef SOLAR_JAVA
-                    nWhich == SID_INSERT_APPLET ||
-#endif
-                    eCreateMode == SFX_CREATE_MODE_EMBEDDED || bCrsrInHidden )
+                if( eCreateMode == SFX_CREATE_MODE_EMBEDDED || bCrsrInHidden )
                 {
                     rSet.DisableItem( nWhich );
                 }
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 8a02ce6395..8640319d7f 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -127,7 +127,7 @@
 #include <view.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-
+#include <sfx2/objface.hxx>
 #include <langhelper.hxx>
 
 using namespace ::com::sun::star;
@@ -461,7 +461,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg( DLG_INS_FOOTNOTE,
                                                         GetView().GetWindow(), rWrtSh, FALSE );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
-            pDlg->SetHelpId(nSlot);
+            pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand());
             if ( pDlg->Execute() == RET_OK )
             {
                 USHORT nId = pDlg->IsEndNote() ? FN_INSERT_ENDNOTE : FN_INSERT_FOOTNOTE;
diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src
index 6c30097791..92e20c682b 100644
--- a/sw/source/ui/table/chartins.src
+++ b/sw/source/ui/table/chartins.src
@@ -50,12 +50,14 @@ ModelessDialog DLG_INSERT_CHART
     };
     Edit ED_RANGE
     {
+        HelpID = "sw:Edit:DLG_INSERT_CHART:ED_RANGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 ) ;
         Size = MAP_APPFONT ( 229 , 12 ) ;
     };
     CheckBox CB_FIRST_ROW
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_CHART:CB_FIRST_ROW";
         Pos = MAP_APPFONT ( 12 , 32 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -64,6 +66,7 @@ ModelessDialog DLG_INSERT_CHART
     };
     CheckBox CB_FIRST_COL
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_CHART:CB_FIRST_COL";
         Pos = MAP_APPFONT ( 12 , 46 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -96,6 +99,7 @@ ModelessDialog DLG_INSERT_CHART
     };
     PushButton BT_PREV
     {
+        HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_PREV";
         Pos = MAP_APPFONT ( 130 , 151 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
          // ### ACHTUNG: Neuer Text in Resource? << ~Zurück : << Zurück
@@ -106,6 +110,7 @@ ModelessDialog DLG_INSERT_CHART
     };
     PushButton BT_NEXT
     {
+        HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_NEXT";
         Pos = MAP_APPFONT ( 185 , 151 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -114,6 +119,7 @@ ModelessDialog DLG_INSERT_CHART
     };
     PushButton BT_FINISH
     {
+        HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_FINISH";
         Pos = MAP_APPFONT ( 240 , 151 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src
index cd34b41bd5..1df5fe2cfc 100644
--- a/sw/source/ui/table/colwd.src
+++ b/sw/source/ui/table/colwd.src
@@ -32,7 +32,7 @@
  // #define DLG_COL_WIDTH 256
 ModalDialog DLG_COL_WIDTH
 {
-    HelpID = FN_TABLE_SET_COL_WIDTH ;
+    HelpID = CMD_FN_TABLE_SET_COL_WIDTH ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 159 , 60 ) ;
@@ -66,6 +66,7 @@ ModalDialog DLG_COL_WIDTH
     };
     MetricField ED_WIDTH
     {
+        HelpID = "sw:MetricField:DLG_COL_WIDTH:ED_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 51 , 30 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -97,6 +98,7 @@ ModalDialog DLG_COL_WIDTH
     };
     NumericField ED_COL
     {
+        HelpID = "sw:NumericField:DLG_COL_WIDTH:ED_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 51 , 14 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 50baa2bb9a..13e9b9e860 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_CONV_TEXT_TABLE
 {
-    HelpID = FN_CONVERT_TEXT_TABLE ;
+    HelpID = CMD_FN_CONVERT_TEXT_TABLE ;
     OUTPUTSIZE = TRUE ;
     Size = MAP_APPFONT ( 203 , 169 ) ;
     Text [ en-US ] = "Convert Table to Text" ;
@@ -39,6 +39,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     SVLOOK = TRUE ;
     RadioButton CB_TAB
     {
+        HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB";
         Pos = MAP_APPFONT ( 12 , 17 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Tabs" ;
@@ -48,6 +49,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     RadioButton CB_SEMI
     {
+        HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI";
         Pos = MAP_APPFONT ( 75 , 17 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Semicolons" ;
@@ -55,6 +57,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     RadioButton CB_PARA
     {
+        HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA";
         Pos = MAP_APPFONT ( 12 , 33 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Paragraph" ;
@@ -62,12 +65,14 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     RadioButton RB_OTHER
     {
+        HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER";
         Pos = MAP_APPFONT ( 75 , 33 ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Other: " ;
     };
     Edit ED_OTHER
     {
+        HelpID = "sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER";
         Border = TRUE ;
         Left = TRUE ;
         Pos = MAP_APPFONT ( 123 , 32 ) ;
@@ -77,6 +82,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     CheckBox CB_KEEPCOLUMN
     {
+        HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN";
         Pos = MAP_APPFONT ( 12 , 49 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         Check = TRUE;
@@ -92,6 +98,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     CheckBox CB_HEADER
     {
+        HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 123 , 10 ) ;
         TabStop = TRUE ;
@@ -99,6 +106,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     CheckBox CB_REPEAT_HEADER
     {
+        HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER";
         Pos = MAP_APPFONT ( 22 , 97 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Repeat heading";
@@ -112,6 +120,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     NumericField NF_REPEAT_HEADER
     {
+        HelpID = "sw:NumericField:DLG_CONV_TEXT_TABLE:NF_REPEAT_HEADER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 191 , 112 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -130,6 +139,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     CheckBox CB_DONT_SPLIT
     {
+        HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT";
         Pos = MAP_APPFONT ( 12 , 126 ) ;
         Size = MAP_APPFONT ( 123 , 10 ) ;
         TabStop = TRUE ;
@@ -137,6 +147,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     CheckBox CB_BORDER
     {
+        HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 123 , 10 ) ;
         TabStop = TRUE ;
@@ -173,6 +184,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     };
     PushButton BT_AUTOFORMAT
     {
+        HelpID = "sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT";
         Pos = MAP_APPFONT ( 12 , 152 ) ;
         Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src
index 3930bb36ab..e5a636d3b8 100644
--- a/sw/source/ui/table/instable.src
+++ b/sw/source/ui/table/instable.src
@@ -32,7 +32,7 @@
  // #define DLG_INSERT_TABLE 256
 ModalDialog DLG_INSERT_TABLE
 {
-    HelpID = FN_INSERT_TABLE ;
+    HelpID = CMD_FN_INSERT_TABLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 280 , 166 ) ;
@@ -40,6 +40,7 @@ ModalDialog DLG_INSERT_TABLE
     Moveable = TRUE ;
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:DLG_INSERT_TABLE:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 53 , 6 ) ;
         Size = MAP_APPFONT ( 158, 12 ) ;
@@ -60,6 +61,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     NumericField ED_COL
     {
+        HelpID = "sw:NumericField:DLG_INSERT_TABLE:ED_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 53 , 32 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -82,6 +84,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     NumericField ED_ROW
     {
+        HelpID = "sw:NumericField:DLG_INSERT_TABLE:ED_ROW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 53 , 48 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -103,6 +106,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     CheckBox CB_HEADER
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER";
         Pos = MAP_APPFONT ( 12 , 74 ) ;
         Size = MAP_APPFONT (113 , 10 ) ;
         TabStop = TRUE ;
@@ -110,6 +114,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     CheckBox CB_REPEAT_HEADER
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER";
         Pos = MAP_APPFONT ( 21 , 88 ) ;
         Size = MAP_APPFONT ( 104 , 10 ) ;
         TabStop = TRUE ;
@@ -123,6 +128,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     NumericField NF_REPEAT_HEADER
     {
+        HelpID = "sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 104 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -141,6 +147,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     CheckBox CB_DONT_SPLIT
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT";
         Pos = MAP_APPFONT ( 12 , 118 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Don't split table";
@@ -148,6 +155,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     CheckBox CB_BORDER
     {
+        HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER";
         Pos = MAP_APPFONT ( 12 , 132 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
@@ -155,6 +163,7 @@ ModalDialog DLG_INSERT_TABLE
     };
     PushButton BT_AUTOFORMAT
     {
+        HelpID = "sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT";
         Pos = MAP_APPFONT ( 12 , 146 ) ;
         Size = MAP_APPFONT ( 86 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src
index 97ef9cb2cd..de6fa33159 100644
--- a/sw/source/ui/table/mergetbl.src
+++ b/sw/source/ui/table/mergetbl.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_MERGE_TABLE
 {
-    HelpID = FN_TABLE_MERGE_TABLE ;
+    HelpID = CMD_FN_TABLE_MERGE_TABLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 207 , 57 ) ;
@@ -63,6 +63,7 @@ ModalDialog DLG_MERGE_TABLE
     };
     RadioButton RB_MERGE_PREV
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_PREV";
         Pos = MAP_APPFONT ( 12 , 15 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Check = TRUE ;
@@ -71,6 +72,7 @@ ModalDialog DLG_MERGE_TABLE
     };
     RadioButton RB_MERGE_NEXT
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_NEXT";
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Text [ en-US ] = "Join with ~next table";
diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src
index ea3ac27474..6d537f415a 100644
--- a/sw/source/ui/table/rowht.src
+++ b/sw/source/ui/table/rowht.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_ROW_HEIGHT
 {
-    HelpID = FN_TABLE_SET_ROW_HEIGHT ;
+    HelpID = CMD_FN_TABLE_SET_ROW_HEIGHT ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 157 , 60 ) ;
@@ -59,6 +59,7 @@ ModalDialog DLG_ROW_HEIGHT
     };
     MetricField ED_HEIGHT
     {
+        HelpID = "sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 16 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -76,6 +77,7 @@ ModalDialog DLG_ROW_HEIGHT
     };
     CheckBox CB_AUTOHEIGHT
     {
+        HelpID = "sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT";
         Pos = MAP_APPFONT ( 12 , 34 ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~dynamisch anpassen : auto. H~öhe */
diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src
index e58d64ab96..d785f9ea06 100644
--- a/sw/source/ui/table/splittbl.src
+++ b/sw/source/ui/table/splittbl.src
@@ -31,7 +31,7 @@
 #include "helpid.h"
 ModalDialog DLG_SPLIT_TABLE
 {
-    HelpID = FN_TABLE_SPLIT_TABLE ;
+    HelpID = CMD_FN_TABLE_SPLIT_TABLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 207 , 76 ) ;
@@ -63,6 +63,7 @@ ModalDialog DLG_SPLIT_TABLE
     };
     RadioButton RB_CNTNT
     {
+        HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_CNTNT";
         Pos = MAP_APPFONT ( 12 , 15 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Check = TRUE ;
@@ -71,18 +72,21 @@ ModalDialog DLG_SPLIT_TABLE
     };
     RadioButton RB_BOX_PARA
     {
+        HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_PARA";
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Text [ en-US ] = "C~ustom heading (apply Style)" ;
     };
     RadioButton RB_BOX_NOPARA
     {
+        HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_NOPARA";
         Pos = MAP_APPFONT ( 12 , 45 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Text [ en-US ] = "Cu~stom heading" ;
     };
     RadioButton RB_BORDER
     {
+        HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BORDER";
         Pos = MAP_APPFONT ( 12 , 60 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Text [ en-US ] = "~No heading" ;
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 0dd3607c2d..b3d52ec516 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -98,6 +98,7 @@ TabPage TP_FORMAT_TABLE
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_FORMAT_TABLE:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 14 ) ;
         Size = MAP_APPFONT ( 112 , 12 ) ;
@@ -111,6 +112,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_WIDTH
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -129,6 +131,7 @@ TabPage TP_FORMAT_TABLE
     };
     CheckBox CB_REL_WIDTH
     {
+        HelpID = "sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH";
         Pos = MAP_APPFONT ( 118 , 32 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -142,6 +145,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FULL
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FULL";
         Pos = MAP_APPFONT ( 202 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -149,6 +153,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_LEFT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT";
         Pos = MAP_APPFONT ( 202 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -156,6 +161,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FROM_LEFT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT";
         Pos = MAP_APPFONT ( 202 , 42 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -163,6 +169,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_RIGHT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT";
         Pos = MAP_APPFONT ( 202 , 56 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "R~ight" ;
@@ -170,6 +177,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_CENTER
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER";
         Pos = MAP_APPFONT ( 202 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Center" ;
@@ -177,6 +185,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FREE
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FREE";
         Pos = MAP_APPFONT ( 202 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -202,6 +211,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_LEFT_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST";
         Pos = MAP_APPFONT ( 147 , 59 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -226,6 +236,7 @@ TabPage TP_FORMAT_TABLE
 
     MetricField ED_RIGHT_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST";
         Pos = MAP_APPFONT ( 147 , 75 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -249,6 +260,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_TOP_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST";
         Pos = MAP_APPFONT ( 147 , 91 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -272,6 +284,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_BOTTOM_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 147 , 107 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -303,6 +316,7 @@ TabPage TP_FORMAT_TABLE
     };
     ListBox     LB_TEXTDIRECTION
     {
+        HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 136 ) ;
         Size = MAP_APPFONT ( 176 , 50 ) ;
@@ -329,6 +343,7 @@ TabPage TP_TABLE_COLUMN
     Hide = TRUE;
     CheckBox CB_MOD_TBL
     {
+        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -336,6 +351,7 @@ TabPage TP_TABLE_COLUMN
     };
     CheckBox CB_PROP
     {
+        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_PROP";
         Pos = MAP_APPFONT ( 6 , 20 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -349,6 +365,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField ED_SPACE
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:ED_SPACE";
         ReadOnly = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 95 , 34 ) ;
@@ -365,6 +382,7 @@ TabPage TP_TABLE_COLUMN
     };
     ImageButton COL_BTN_DOWN
     {
+        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 65 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -373,6 +391,7 @@ TabPage TP_TABLE_COLUMN
     };
     ImageButton COL_BTN_UP
     {
+        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 234 , 65 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -391,6 +410,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_1
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_1";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 13 , 81 ) ;
@@ -418,6 +438,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_2
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_2";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 52 , 81 ) ;
@@ -445,6 +466,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_3
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_3";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 81 ) ;
@@ -472,6 +494,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_4
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_4";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 81 ) ;
@@ -499,6 +522,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_5
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_5";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 169 , 81 ) ;
@@ -526,6 +550,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_6
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_6";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 208 , 81 ) ;
@@ -568,6 +593,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_PAGEBREAK
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 8 ) ;
@@ -577,6 +603,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_BREAKPAGE
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE";
         Pos = MAP_APPFONT ( 105 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Page" ;
@@ -585,6 +612,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_BREAKCOLUMN
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 178 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -593,6 +621,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_PAGEBREAKBEFORE
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 105 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -602,6 +631,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_PAGEBREAKAFTER
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 178 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -609,6 +639,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_PAGECOLL
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
@@ -618,6 +649,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_PAGECOLL
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL";
         Pos = MAP_APPFONT ( 105 , 42 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
         TabStop = TRUE ;
@@ -631,6 +663,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     NumericField NF_PAGENUM
     {
+        HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 222 , 42 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -646,6 +679,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_SPLIT
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT";
         Pos = MAP_APPFONT ( 12 , 58 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -653,6 +687,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     TriStateBox CB_SPLIT_ROW
     {
+        HelpID = "sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW";
         Pos = MAP_APPFONT ( 21 , 71 ) ;
         Size = MAP_APPFONT ( 227 , 10 ) ;
         TabStop = TRUE ;
@@ -660,6 +695,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_KEEP
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP";
         Pos = MAP_APPFONT ( 12 , 85 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Keep with next paragraph" ;
@@ -667,6 +703,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_HEADLINE
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE";
         Pos = MAP_APPFONT ( 12 , 99 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -680,6 +717,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     NumericField NF_REPEAT_HEADER
     {
+        HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 131 , 113 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -704,6 +742,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_TEXTDIRECTION
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION";
         Pos = MAP_APPFONT ( 85 , 130 ) ;
         Size = MAP_APPFONT ( 163 , 50 ) ;
         DropDown = TRUE;
@@ -730,6 +769,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_VERTORIENT
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT";
         Pos = MAP_APPFONT ( 85 , 162 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
         DropDown = TRUE;
diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src
index ab314e0932..ec6eaad812 100644
--- a/sw/source/ui/table/tautofmt.src
+++ b/sw/source/ui/table/tautofmt.src
@@ -43,6 +43,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     ListBox LB_FORMAT
     {
+        HelpID = "sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 65 , 100 ) ;
@@ -56,6 +57,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     CheckBox BTN_NUMFORMAT
     {
+        HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 131 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -64,6 +66,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     CheckBox BTN_BORDER
     {
+        HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 147 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -72,6 +75,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     CheckBox BTN_FONT
     {
+        HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 85 , 131 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -80,6 +84,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     CheckBox BTN_PATTERN
     {
+        HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 85 , 147 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -88,6 +93,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     CheckBox BTN_ALIGNMENT
     {
+        HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 150 , 131 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -116,6 +122,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     MoreButton BTN_MORE
     {
+        HelpID = "sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE";
         Pos = MAP_APPFONT ( 255 , 101 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~More" ;
@@ -125,6 +132,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     PushButton BTN_ADD
     {
+        HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD";
         Pos = MAP_APPFONT ( 255 , 64 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
@@ -132,6 +140,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     PushButton BTN_REMOVE
     {
+        HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE";
         Pos = MAP_APPFONT ( 255 , 81 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
@@ -139,6 +148,7 @@ ModalDialog DLG_AUTOFMT_TABLE
     };
     PushButton BTN_RENAME
     {
+        HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_RENAME";
         Pos = MAP_APPFONT ( 255 , 123 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -219,6 +229,7 @@ ModalDialog DLG_SWDLG_STRINPUT
     HelpID = HID_SWDLG_STRINPUT ;
     Edit ED_INPUT
     {
+        HelpID = "sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 24 ) ;
         Size = MAP_APPFONT ( 104 , 12 ) ;
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index a633abb3e9..f798aafcb1 100755..100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-
 #include <sfx2/objface.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/field.hxx>
@@ -54,10 +52,7 @@
 #include <svx/svdview.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/zoomslideritem.hxx>
-#ifndef _SVX_SVXIDS_HRC //autogen
 #include <svx/svxids.hrc>
-#endif
-
 
 #include <swwait.hxx>
 #include <globdoc.hxx>
@@ -73,27 +68,16 @@
 #include <view.hxx>
 #include <textsh.hxx>
 #include <scroll.hxx>
-#include <swprtopt.hxx>
+#include <prtopt.hxx>
 #include <docstat.hxx>
 #include <usrpref.hxx>
 #include <viewfunc.hxx>
 
-
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _POPUP_HRC
 #include <popup.hrc>
-#endif
-#ifndef _PVIEW_HRC
 #include <pview.hrc>
-#endif
 
 #define SwPagePreView
 #include <sfx2/msg.hxx>
@@ -105,6 +89,7 @@
 #include <svx/dialogs.hrc>
 #include <vos/mutex.hxx>
 
+
 using namespace ::com::sun::star;
 
 
@@ -1292,8 +1277,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
     GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions());
 
     // OD 09.01.2003 #i6467# - adjust view shell option to the same as for print
-    SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) );
-    aPrintOptions.MakeOptions( false );
+    SwPrintData const aPrintOptions = *SW_MOD()->GetPrtOptions(false);
     GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions );
 
     IDocumentSettingAccess* pIDSA = pESh->getIDocumentSettingAccess();
@@ -1451,9 +1435,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori )
     {
 
         pPageUpBtn		= new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) );
-        pPageUpBtn->SetHelpId(FN_PAGEUP);
+        pPageUpBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEUP)->GetCommand());
         pPageDownBtn	= new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) );
-        pPageDownBtn->SetHelpId(FN_PAGEDOWN);
+        pPageDownBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEDOWN)->GetCommand());
         Link aLk( LINK( this, SwPagePreView, BtnPage ) );
         pPageUpBtn->SetClickHdl( aLk );
         pPageDownBtn->SetClickHdl( aLk );
diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src
index 4b97c83c43..99b325b3ce 100755..100644
--- a/sw/source/ui/uiview/pview.src
+++ b/sw/source/ui/uiview/pview.src
@@ -54,6 +54,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM
     };
     NumericField ED_COL
     {
+        HelpID = "sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL";
         Border = TRUE ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
         Pos = MAP_APPFONT ( 48 , 34 ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM
     };
     NumericField ED_ROW
     {
+        HelpID = "sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 48 , 13 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -106,92 +108,4 @@ String RID_PVIEW_TOOLBOX
 {
     Text [ en-US ] = "Page Preview" ;
 };
-ToolBox RID_PVIEW_TOOLBOX
-{
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    HelpID = HID_PVIEW_TOOLBOX ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = FN_PAGEUP ;
-            HelpID = FN_PAGEUP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_PAGEDOWN ;
-            HelpID = FN_PAGEDOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_START_OF_DOCUMENT ;
-            HelpID = FN_START_OF_DOCUMENT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_END_OF_DOCUMENT ;
-            HelpID = FN_END_OF_DOCUMENT ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = FN_SHOW_TWO_PAGES ;
-            HelpID = FN_SHOW_TWO_PAGES ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_SHOW_MULTIPLE_PAGES ;
-            HelpID = FN_SHOW_MULTIPLE_PAGES ;
-            DropDown = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_SHOW_BOOKVIEW ;
-            HelpID = FN_SHOW_BOOKVIEW ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOM_OUT;
-            HelpID = SID_ZOOM_OUT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOM_IN;
-            HelpID = SID_ZOOM_IN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_PREVIEW_ZOOM;
-            HelpID = HID_PREVIEW_ZOOM ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_WIN_FULLSCREEN ;
-            HelpID = SID_WIN_FULLSCREEN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_PRINT_PAGEPREVIEW ;
-            HelpID = FN_PRINT_PAGEPREVIEW ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = FN_CLOSE_PAGEPREVIEW;
-            HelpID = SID_PRINTPREVIEW;
-        };
-    };
-    Scroll = TRUE ;
-};
 
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index 996ab9b235..f3e8b6f2c5 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -27,16 +27,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 
+#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 
 #include <wrtsh.hxx>
+#include <doc.hxx>
 #include <swtypes.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
 #include <edtwin.hxx>
 #include <swcli.hxx>
+#include <cmdid.h>
+#include <cfgitems.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
 
@@ -169,3 +170,18 @@ void SwOleClient::MakeVisible()
     const SwWrtShell &rSh  = ((SwView*)GetViewShell())->GetWrtShell();
     rSh.MakeObjVisible( GetObject() );
 }
+
+// --> #i972#
+void SwOleClient::FormatChanged()
+{
+    const uno::Reference < embed::XEmbeddedObject >& xObj( GetObject() );
+    SwView * pView = dynamic_cast< SwView * >( GetViewShell() );
+    if ( pView && xObj.is() && SotExchange::IsMath( xObj->getClassID() ) )
+    {
+        SwWrtShell & rWrtSh = pView->GetWrtShell();
+        if (rWrtSh.GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ))
+            rWrtSh.AlignFormulaToBaseline( xObj );
+    }
+}
+// <--
+
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 8d750d9234..1722c0ac13 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -94,7 +94,6 @@
 #include <frmui.hrc>
 #include <cfgitems.hxx>
 #include <prtopt.hxx>
-#include <swprtopt.hxx>
 #include <linguistic/lngprops.hxx>
 #include <editeng/unolingu.hxx>
 //#include <sfx2/app.hxx>
@@ -1912,8 +1911,7 @@ SfxObjectShellRef & SwView::GetOrCreateTmpSelectionDoc()
     if (!rxTmpDoc.Is())
     {
         SwXTextView *pImpl = GetViewImpl()->GetUNOObject_Impl();
-        rxTmpDoc = pImpl->BuildTmpSelectionDoc(
-                    GetViewImpl()->GetEmbeddedObjRef() );
+        rxTmpDoc = pImpl->BuildTmpSelectionDoc();
     }
     return rxTmpDoc;
 }
@@ -1927,17 +1925,12 @@ void SwView::AddTransferable(SwTransferable& rTransferable)
 
 /* --------------------------------------------------*/
 
-void SwPrtOptions::MakeOptions( BOOL bWeb )
-{
-    *this = *SW_MOD()->GetPrtOptions(bWeb);
-
-    nCopyCount = 1;
-    bCollate = FALSE;
-    bPrintSelection = FALSE;
-    bJobStartet = FALSE;
+namespace sw {
 
-    aMulti.SetTotalRange( Range( 0, RANGE_MAX ) );
-    aMulti.SelectAll();
-    aMulti.Select( 0, FALSE );
+void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb)
+{
+    o_rData = *SW_MOD()->GetPrtOptions(bWeb);
 }
 
+} // namespace sw
+
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 233664b509..e006ee71ae 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -196,160 +196,6 @@ String MN_SRCVIEW_POPUPMENU
     Text [ en-US ] = "HTML source" ;
 };
 
-ToolBox RID_TOOLS_TOOLBOX
-{
-    HelpID = HID_TOOLS_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Scroll = TRUE ;
-    Align = BOXALIGN_LEFT ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_CTRL ;
-            HelpID = HID_INSERT_CTRL ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_FIELD_CTRL ;
-            HelpID = HID_INSERT_FIELD_CTRL ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_OBJ_CTRL ;
-            HelpID = HID_INSERT_OBJ_CTRL ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_INSERT_DRAW
-        };
-        ToolBoxItem
-        {
-            ITEM_FORM_CONFIG
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_GLOSSARY_DLG ;
-            HelpID = FN_GLOSSARY_DLG ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_CAPTION;
-            HelpID = FN_INSERT_CAPTION ;
-            Hide = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_IDX_ENTRY_DLG;
-            HelpId = FN_INSERT_IDX_ENTRY_DLG;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_REF_FIELD;
-            HelpID = FN_INSERT_REF_FIELD ;
-            Hide = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_SHADOWCURSOR ;
-            HelpID = FN_SHADOWCURSOR ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_SPELL_GRAMMAR_DIALOG;
-            HelpID = FN_SPELL_GRAMMAR_DIALOG;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_AUTOSPELL_CHECK
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_HYPHENATE_OPT_DLG;
-            HelpID = FN_HYPHENATE_OPT_DLG;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_THESAURUS;
-            HelpID = SID_THESAURUS;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SEARCH_DLG ;
-            HelpID = SID_SEARCH_DLG ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_VIEW_DATA_SOURCE_BROWSER ;
-            HelpID = SID_VIEW_DATA_SOURCE_BROWSER ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_ZOOM;
-            HelpID = SID_ATTR_ZOOM ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_VIEW_META_CHARS ;
-            HelpID = FN_VIEW_META_CHARS ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_VIEW_FIELDNAME ;
-            HelpID = FN_VIEW_FIELDNAME ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_VIEW_GRAPHIC ;
-            HelpID = FN_VIEW_GRAPHIC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BROWSER_MODE ;
-            HelpID = SID_BROWSER_MODE ;
-        };
-    };
-};
 Menu MN_SRCVIEW_POPUPMENU
 {
     ItemList =
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx
index 27f017c517..8388df1566 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/ui/uiview/viewdlg2.cxx
@@ -31,7 +31,7 @@
 
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-
+#include <sfx2/objface.hxx>
 
 #include <fldmgr.hxx>
 #include <expfld.hxx>
@@ -92,7 +92,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
                                                         pMDI, *pWrtShell, TRUE );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
 
-            pDlg->SetHelpId(FN_EDIT_FOOTNOTE);
+            pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand());
             pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) );
             pDlg->Execute();
             delete pDlg;
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 88ad18947b..45e9272250 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -70,7 +70,6 @@
 #include <docsh.hxx>
 #include <viewopt.hxx>
 #include <prtopt.hxx>
-#include <swprtopt.hxx>
 #include <fontcfg.hxx>
 #include <cfgitems.hxx>
 #include <dbmgr.hxx>
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 36b7d7afd6..b19a36cba5 100755..100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -123,7 +123,8 @@ enum SwDocumentSettingsPropertyHandles
     // --> OD 2008-06-05 #i89181#
     HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST,
     // <--
-    HANDLE_MODIFYPASSWORDINFO
+    HANDLE_MODIFYPASSWORDINFO,
+    HANDLE_MATH_BASELINE_ALIGNMENT
 };
 
 MasterPropertySetInfo * lcl_createSettingsInfo()
@@ -178,6 +179,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
         // --> OD 2008-06-05 #i89181#
         { RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0},
         { RTL_CONSTASCII_STRINGPARAM("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, CPPUTYPE_PROPERTYVALUE, 0,   0},
+        { RTL_CONSTASCII_STRINGPARAM("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, CPPUTYPE_BOOLEAN, 0, 0},
 
 /*
  * As OS said, we don't have a view when we need to set this, so I have to
@@ -686,6 +688,12 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
                     uno::Reference< uno::XInterface >() );
         }
         break;
+        case HANDLE_MATH_BASELINE_ALIGNMENT:
+        {
+            sal_Bool bTmp = *(sal_Bool*)rValue.getValue();
+            mpDoc->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, bTmp );
+        }
+        break;
         default:
             throw UnknownPropertyException();
     }
@@ -1018,6 +1026,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
             rValue <<= mpDocSh->GetModifyPasswordInfo();
         }
         break;
+        case HANDLE_MATH_BASELINE_ALIGNMENT:
+        {
+            sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+            rValue.setValue( &bTmp, ::getBooleanCppuType() );
+        }
+        break;
 
         default:
             throw UnknownPropertyException();
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 50c19caaac..f5da10cb6f 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -52,7 +52,7 @@
 #include <comphelper/ChainablePropertySetInfo.hxx>
 #include <edtwin.hxx>
 #include <rtl/ustrbuf.hxx>
-
+#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -799,14 +799,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
                 OUString sHelpURL;
                 if ( ! ( rValue >>= sHelpURL ) )
                     throw IllegalArgumentException();
-                SwEditWin &rEditWin = pView->GetEditWin();
-                OUString sPrefix = sHelpURL.copy ( 0, 4 );
-                // Make sure we have a valid string...should be in the format HID:12345
-                if ( ! sPrefix.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "HID:" ) ) )
+
+                INetURLObject aHID( sHelpURL );
+                if ( aHID.GetProtocol() == INET_PROT_HID )
+                      pView->GetEditWin().SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
+                else
                     throw IllegalArgumentException ();
-                OUString sNumber = sHelpURL.copy ( 4 );
-                sal_uInt32 nHelpId = sNumber.toInt32();
-                rEditWin.SetHelpId ( nHelpId );
             }
             else
                 throw UnknownPropertyException();
@@ -918,7 +916,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
         case  HANDLE_VIEWSET_TABSTOPS              :   bBoolVal = mpConstViewOption->IsTab(sal_True);	break;
         case  HANDLE_VIEWSET_BREAKS                :   bBoolVal = mpConstViewOption->IsLineBreak(sal_True); break;
         case  HANDLE_VIEWSET_HIDDEN_TEXT           :   bBoolVal = mpConstViewOption->IsShowHiddenField();   break;
-        case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   bBoolVal = mpConstViewOption->IsShowHiddenChar(); break;
+        case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   bBoolVal = mpConstViewOption->IsShowHiddenChar(sal_True); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   bBoolVal = mpConstViewOption->IsShowHiddenPara();	break;
         case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   bBoolVal = SwViewOption::IsTableBoundaries(); break;
         case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   bBoolVal = SwViewOption::IsDocBoundaries(); break;
@@ -985,9 +983,9 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
             {
                 bBool = sal_False;
                 OUStringBuffer sHelpURL;
-                sHelpURL.appendAscii ( "HID:" );
+                sHelpURL.appendAscii ( INET_HID_SCHEME );
                 SwEditWin &rEditWin = pView->GetEditWin();
-                sHelpURL.append ( static_cast < sal_Int32 > ( rEditWin.GetHelpId() ) );
+                sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
                 rValue <<= sHelpURL.makeStringAndClear();
             }
             else
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 8dd657d3ee..7752e74d28 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -47,7 +47,7 @@
 #include <srcview.hxx>
 #include <viewsh.hxx>
 #include <pvprtdat.hxx>
-#include <swprtopt.hxx>
+#include <printdata.hxx>
 #include <svl/stritem.hxx>
 #include <unotxdoc.hxx>
 #include <svl/numuno.hxx>
@@ -83,7 +83,6 @@
 #include <globals.hrc>
 #include <unomid.h>
 #include <unotools/printwarningoptions.hxx>
-
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -948,7 +947,7 @@ SwUnoCrsr* 	SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
                                 RES_CHRATR_BEGIN, RES_CHRATR_END-1,
                                 RES_PARATR_BEGIN, RES_PARATR_END-1,
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1,
-                                RES_TXTATR_INETFMT,	RES_TXTATR_INETFMT,
+                                RES_TXTATR_INETFMT,	RES_TXTATR_CHARFMT,
                                 0);
             pSearch->FillSearchItemSet(aSearch);
             BOOL bCancel;
@@ -2716,14 +2715,15 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
                     m_pRenderData->ViewOptionAdjustStart( *pWrtShell, *pWrtShell->GetViewOptions() );
             }
 
-            m_pRenderData->SetSwPrtOptions( new SwPrtOptions( C2U( bIsPDFExport ? "PDF export" : "Printing" ) ) );
+            m_pRenderData->SetSwPrtOptions( new SwPrintData );
             m_pRenderData->MakeSwPrtOptions( m_pRenderData->GetSwPrtOptionsRef(), pRenderDocShell,
                     m_pPrintUIOptions, m_pRenderData, bIsPDFExport );
-                
+
             if (pView->IsA(aSwViewTypeId))
             {
                 // PDF export should not make use of the SwPrtOptions
-                const SwPrtOptions *pPrtOptions = bIsPDFExport? NULL : m_pRenderData->GetSwPrtOptions();
+                const SwPrintData *pPrtOptions = (bIsPDFExport)
+                    ? NULL : m_pRenderData->GetSwPrtOptions();
                 m_pRenderData->ViewOptionAdjust( pPrtOptions );
             }
 
@@ -3080,19 +3080,20 @@ void SAL_CALL SwXTextDocument::render(
                     SwWrtShell* pWrtShell = pView->IsA(aSwViewTypeId) ?
                                             ((SwView*)pView)->GetWrtShellPtr() :
                                             0;
-        
+
                     if (bIsPDFExport && bFirstPage && pWrtShell)
                     {
                         SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_False );
                     }
                     // <--
-        
-                    const SwPrtOptions &rSwPrtOptions = *m_pRenderData->GetSwPrtOptions();
+
+                    SwPrintData const& rSwPrtOptions =
+                        *m_pRenderData->GetSwPrtOptions();
                     if (bPrintProspect)
                         pVwSh->PrintProspect( pOut, rSwPrtOptions, nRenderer );
                     else    // normal printing and PDF export
                         pVwSh->PrintOrPDFExport( pOut, rSwPrtOptions, nRenderer );
-        
+
                     // --> FME 2004-10-08 #i35176#
                     //
                     // After printing the last page, we take care for the links coming
@@ -4110,8 +4111,8 @@ SwViewOptionAdjust_Impl::~SwViewOptionAdjust_Impl()
 }
 
 
-void SwViewOptionAdjust_Impl::AdjustViewOptions( 
-    const SwPrtOptions *pPrtOptions )
+void
+SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
 {
     // to avoid unnecessary reformatting the view options related to the content
     // below should only change if necessary, that is if respective content is present
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 8ba286f926..3ec786f45d 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -903,14 +903,17 @@ void SAL_CALL SwXTextView::setRubyList(
 /*-- 29.12.02 15:45:29---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SfxObjectShellRef SwXTextView::BuildTmpSelectionDoc( SfxObjectShellRef& /*rRef*/ )
+SfxObjectShellRef SwXTextView::BuildTmpSelectionDoc()
 {
     SwWrtShell& rOldSh = m_pView->GetWrtShell();
     SfxPrinter *pPrt = rOldSh.getIDocumentDeviceAccess()->getPrinter( false );
     SwDocShell* pDocSh;
     SfxObjectShellRef xDocSh( pDocSh = new SwDocShell( /*pPrtDoc, */SFX_CREATE_MODE_STANDARD ) );
     xDocSh->DoInitNew( 0 );
-    rOldSh.FillPrtDoc(pDocSh->GetDoc(),  pPrt);
+    SwDoc *const pTempDoc( pDocSh->GetDoc() );
+    // #i103634#, #i112425#: do not expand numbering and fields on PDF export
+    pTempDoc->SetClipBoard(true);
+    rOldSh.FillPrtDoc(pTempDoc,  pPrt);
     SfxViewFrame* pDocFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
     SwView* pDocView = (SwView*) pDocFrame->GetViewShell();
     pDocView->AttrChangedNotify( &pDocView->GetWrtShell() );//Damit SelectShell gerufen wird.
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 418d9ace33..e6c98ed02e 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -952,6 +952,7 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) :
     aUpdTimer.SetTimeout(1000);
     Clear();
     EnableContextMenuHandling();
+    SetStyle( GetStyle() | WB_QUICK_SEARCH );
 }
 
 /***************************************************************************
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index d4e5463790..a118ca13ab 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -117,7 +117,7 @@ using ::rtl::OUString;
 #define  GLBL_TABPOS_SUB 5
 
 const SfxObjectShell* SwGlobalTree::pShowShell = 0;
-static const USHORT __FAR_DATA aHelpForMenu[] =
+static const char* __FAR_DATA aHelpForMenu[] =
 {
     0, 							//
     HID_GLBLTREE_UPDATE, 		//CTX_UPDATE
diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src
index 1ccf855ffe..db34b8c5ae 100644
--- a/sw/source/ui/utlui/gloslst.src
+++ b/sw/source/ui/utlui/gloslst.src
@@ -68,6 +68,7 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG
     };
     ListBox LB_LIST
     {
+        HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST";
         Pos = MAP_APPFONT ( 12 , 15 ) ;
         Size = MAP_APPFONT ( 81 , 40 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 65731de981..c4147c3910 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -260,7 +260,8 @@ ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( SvStringsDtor& rLst )
             p->SearchAndReplace(C2S("%1"), C2S(",,"));
             p->SearchAndReplace(C2S("%2"), C2S("''"));
 #else
-            const LocaleDataWrapper& rLclD = SvtSysLocale().GetLocaleData();
+            const SvtSysLocale aSysLocale;
+            const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData();
             //unter richtigen Betriebssystemen funktioniert es auch so
             p->SearchAndReplace(C2S("%1"), rLclD.getDoubleQuotationMarkStart());
             p->SearchAndReplace(C2S("%2"), rLclD.getDoubleQuotationMarkEnd());
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 55276b7e33..9f27fd34e3 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -429,14 +429,17 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
 
         case FN_DROP_REGION:
         {
+            static const char* aHIDs[] = 
+            {
+                HID_NAVI_DRAG_HYP,
+                HID_NAVI_DRAG_LINK,
+                HID_NAVI_DRAG_COPY,
+            };
             PopupMenu *pMenu = new PopupMenu;
             for (USHORT i = 0; i <= REGION_MODE_EMBEDDED; i++)
             {
                 pMenu->InsertItem( i + 1, aContextArr[i] );
-                pMenu->SetHelpId(i + 1, HID_NAVI_DRAG_HYP + i);
-                    /*HID_NAVI_DRAG_HYP
-                    HID_NAVI_DRAG_LINK
-                    HID_NAVI_DRAG_COPY  */
+                pMenu->SetHelpId(i + 1, aHIDs[i]);
             }
             pMenu->CheckItem( nRegionMode + 1 );
             pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
@@ -865,7 +868,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
         ((SfxDockingWindow*)pParent)->SetOutputSizePixel(aMinSize);
 
     aContentTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
-    aContentTree.SetWindowBits( WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+    aContentTree.SetStyle( aContentTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
                             WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
     aContentTree.SetSpaceBetweenEntries(3);
     aContentTree.SetSelectionMode( SINGLE_SELECTION );
@@ -879,7 +882,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
 // 	TreeListBox fuer Globaldokument
     aGlobalTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
     aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION );
-    aGlobalTree.SetWindowBits( WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+    aGlobalTree.SetStyle( aGlobalTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
                                 WB_CLIPCHILDREN|WB_HSCROLL );
     Size aGlblSize(aGlobalToolBox.CalcWindowSizePixel());
     aGlobalToolBox.SetSizePixel(aGlblSize);
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index c9e10d69c0..fb28ef5000 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -730,7 +730,8 @@ SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, USHORT *pPercent,
 
 String GetAppLangDateTimeString( const DateTime& rDT )
 {
-    const LocaleDataWrapper& rAppLclData = SvtSysLocale().GetLocaleData();
+    const SvtSysLocale aSysLocale;
+    const LocaleDataWrapper& rAppLclData = aSysLocale.GetLocaleData();
     String sRet( rAppLclData.getDate( rDT ));
     ( sRet += ' ' ) += rAppLclData.getTime( rDT, FALSE, FALSE );
     return sRet;
diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src
index aa4be8804c..c6a4443a39 100644
--- a/sw/source/ui/utlui/unotools.src
+++ b/sw/source/ui/utlui/unotools.src
@@ -44,6 +44,7 @@ ModalDialog DLG_RENAME_XNAMED
     };
     Edit ED_NEW_NAME
     {
+        HelpID = "sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME";
         Pos = MAP_APPFONT ( 65 , 13 ) ;
         Size = MAP_APPFONT ( 87 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 08b6707962..b647d83311 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -65,124 +65,6 @@ String RID_WEBTOOLS_TOOLBOX
 {
     Text [ en-US ] = "Main Toolbar/Web" ;
 };
-ToolBox RID_WEBTOOLS_TOOLBOX
-{
-    HelpID = HID_WEBTOOLS_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Scroll = TRUE ;
-    Hide = TRUE ;
-    Align = BOXALIGN_LEFT ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_CTRL ;
-            HelpID = HID_INSERT_CTRL ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_INSERT_FIELD_CTRL ;
-            HelpID = HID_INSERT_FIELD_CTRL ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_DRAW_TEXT_MARQUEE ;
-            HelpID = SID_DRAW_TEXT_MARQUEE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FM_CONFIG ;
-            HelpID = SID_FM_CONFIG;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_GLOSSARY_DLG ;
-            HelpID = FN_GLOSSARY_DLG ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_SPELL_GRAMMAR_DIALOG;
-            HelpID = FN_SPELL_GRAMMAR_DIALOG;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_AUTOSPELL_CHECK
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_HYPHENATE_OPT_DLG;
-            HelpID = FN_HYPHENATE_OPT_DLG;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_THESAURUS;
-            HelpID = SID_THESAURUS;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SEARCH_DLG ;
-            HelpID = SID_SEARCH_DLG ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_ZOOM;
-            HelpID = SID_ATTR_ZOOM ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_VIEW_META_CHARS ;
-            HelpID = FN_VIEW_META_CHARS ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_VIEW_GRAPHIC ;
-            HelpID = FN_VIEW_GRAPHIC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_PRINT_LAYOUT ;
-            HelpID = FN_PRINT_LAYOUT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SOURCEVIEW ;
-            HelpID = HID_SOURCEVIEW ;
-        };
-    };
-};
 /*************************************************************************
     Textleiste
 *************************************************************************/
@@ -190,152 +72,18 @@ String RID_WEBTEXT_TOOLBOX
 {
     Text [ en-US ] = "Text Object Bar/Web" ;
 };
-ToolBox RID_WEBTEXT_TOOLBOX
-{
-    HelpID = HID_WEBTEXT_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Hide = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    LineSpacing = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        MN_TEXT1(TRUE)
-        MN_TEXT_LTR_RTL
-        MN_TEXT_LINESPACE
-        MN_TEXT2
-        MN_TEXT_BACKGROUND
-        MN_TEXT_DIALOGS(TRUE)
-    };
-    Scroll = TRUE ;
-};
 String RID_WEBFRAME_TOOLBOX
 {
     Text [ en-US ] = "Frame Object Bar/Web" ;
 };
-ToolBox RID_WEBFRAME_TOOLBOX
-{
-    HelpID = HID_WEBFRAME_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Hide = TRUE ;
-    LineSpacing = TRUE ;
-    MenuStrings = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    ItemList =
-    {
-        MN_FRAME_WRAP_WEB
-        MN_FRAME1
-        MN_FRAME3
-        MN_LINESTYLE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        MN_BACKGROUND_COLOR
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_FRAME
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_WEBGRAPHIC_TOOLBOX
 {
     Text [ en-US ] = "Graphics Object Bar/Web" ;
 };
-ToolBox RID_WEBGRAPHIC_TOOLBOX
-{
-    HelpID = HID_WEBGRAPHIC_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    MenuStrings = TRUE ;
-    Customize = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_FRAME_WRAP_WEB
-        MN_FRAME1
-        MN_FRAME3
-        MN_LINESTYLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_GRAFIK
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_WEBOLE_TOOLBOX
 {
     Text [ en-US ] = "Object/Web" ;
 };
-ToolBox RID_WEBOLE_TOOLBOX
-{
-    HelpID = HID_OLE_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    Scroll = TRUE ;
-    ItemList =
-    {
-        MN_FRAME_WRAP_WEB
-        MN_FRAME1
-        MN_FRAME3
-        MN_LINESTYLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_OLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-    };
-};
 /*************************************************************************
 
 *************************************************************************/
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index b3087f78fb..3e0a2c8ce7 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/embed/EmbedMisc.hpp>
@@ -42,9 +43,7 @@
 #include <svx/svdview.hxx>
 #include <sot/factory.hxx>
 #include <svl/itemiter.hxx>
-#ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
-#endif
 #include <tools/bigint.hxx>
 #include <sot/storage.hxx>
 #include <svtools/insdlg.hxx>
@@ -60,28 +59,21 @@
 #include <vcl/graph.hxx>
 #include <sfx2/printer.hxx>
 #include <unotools/charclass.hxx>
-
 #include <comphelper/storagehelper.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <frmfmt.hxx>
 #include <fmtftn.hxx>
 #include <fmtpdsc.hxx>
-#ifndef _WDOCSH_HXX
 #include <wdocsh.hxx>
-#endif
-#ifndef _BASESH_HXX
 #include <basesh.hxx>
-#endif
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
 #include <uitool.hxx>
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
+#include <cfgitems.hxx>
 #include <pagedesc.hxx>
 #include <frmmgr.hxx>
 #include <shellio.hxx>
@@ -89,9 +81,7 @@
 #include <swundo.hxx>  // fuer Undo-Ids
 #include <swcli.hxx>
 #include <poolfmt.hxx>
-#ifndef _WVIEW_HXX
 #include <wview.hxx>
-#endif
 #include <edtwin.hxx>
 #include <fmtcol.hxx>
 #include <swtable.hxx>
@@ -100,15 +90,12 @@
 #include <swdtflvr.hxx>
 #include <crsskip.hxx>
 #include <doc.hxx>
-#ifndef _WRTSH_HRC
 #include <wrtsh.hrc>
-#endif
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/request.hxx>
 #include <paratr.hxx>
 #include <ndtxt.hxx>
 #include <editeng/acorrcfg.hxx>
-//#include <svx/acorrcfg.hxx>
 #include <IMark.hxx>
 
 // -> #111827#
@@ -123,6 +110,7 @@
 #include <editeng/acorrcfg.hxx>
 
 #include "PostItMgr.hxx"
+#include <sfx2/msgpool.hxx>
 
 using namespace sw::mark;
 using namespace com::sun::star;
@@ -442,16 +430,6 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
                             pReq->AppendItem(SfxStringItem(FN_PARAM_2, pURL->GetMainURL(INetURLObject::NO_DECODE)));
                         pReq->AppendItem(SfxStringItem(FN_PARAM_3 , aDlg.GetCommands()));
                     } */
-                case SID_INSERT_APPLET:
-                    /*
-                    if(pReq)
-                    {
-                        SvAppletObjectRef xApplet ( xIPObj );
-                        if(xApplet.Is())
-                            pReq->AppendItem(SfxStringItem(FN_PARAM_1 , xApplet->GetCodeBase()));
-                        pReq->AppendItem(SfxStringItem(FN_PARAM_2 , aDlg.GetClass()));
-                        pReq->AppendItem(SfxStringItem(FN_PARAM_3 , aDlg.GetCommands()));
-                    }*/
                 case SID_INSERT_FLOATINGFRAME:
                     /*
                     if(pReq && xFloatingFrame.Is())
@@ -466,9 +444,13 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
                         pReq->AppendItem(SfxBoolItem(FN_PARAM_5, pDescriptor->HasFrameBorder()));
                     }*/
                 {
+                    SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool();
+                    const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId);
+                    rtl::OString aCmd(".uno:");
+                    aCmd += pSlot->GetUnoName();
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     SfxAbstractInsertObjectDialog* pDlg =
-                            pFact->CreateInsertObjectDialog( GetWin(), nSlotId, xStor, &aServerList );
+                            pFact->CreateInsertObjectDialog( GetWin(), rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
                     if ( pDlg )
                     {
                         pDlg->Execute();
@@ -614,6 +596,11 @@ BOOL SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm
     aFrmMgr.SetSize( aSz );
     SwFlyFrmFmt *pFmt = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() );
 
+    // --> #i972#
+    if ( bStarMath && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) )
+        AlignFormulaToBaseline( xRef.GetObject() );
+    // <--
+
     if (pFlyFrmFmt)
         *pFlyFrmFmt = pFmt;
 
@@ -774,6 +761,8 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
         if ( (embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY & nMisc) || bLinkingChart
             // TODO/LATER: ResizeOnPrinterChange
              //|| SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->GetMiscStatus()
+             || nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE // non-resizable objects need to be
+                                                            // set the size back by this method
              )
         {
             pCli = new SwOleClient( &GetView(), &GetView().GetEditWin(), xObj );
@@ -884,6 +873,17 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
 
     if ( bUseObjectSize )
     {
+        // --> this moves non-resizable object so that when adding borders the baseline remains the same 
+        const SwFlyFrmFmt *pFlyFrmFmt = dynamic_cast< const SwFlyFrmFmt * >( GetFlyFrmFmt() );
+        ASSERT( pFlyFrmFmt, "Could not find fly frame." );
+        if ( pFlyFrmFmt )
+        {
+            const Point &rPoint = pFlyFrmFmt->GetLastFlyFrmPrtRectPos();
+            SwRect aRect( pFlyPrtRect ? *pFlyPrtRect
+                        : GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, 0, xObj.GetObject() ));
+            aArea += rPoint - aRect.Pos(); // adjust area by diff of printing area position in order to keep baseline alignment correct.
+        }
+        // <--
         aArea.Width ( _aVisArea.Width() );
         aArea.Height( _aVisArea.Height() );
         RequestObjectResize( aArea, xObj.GetObject() );
@@ -1869,3 +1869,4 @@ String SwWrtShell::GetSelDescr() const
 
     return aResult;
 }
+
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index ac874a9791..1874426528 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -239,15 +239,8 @@ BOOL SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
     return bResult;
 }
 
-BOOL SwWrtShell::UpdateField( sw::mark::IFieldmark &fieldBM )
-{
-    return SwEditShell::UpdateField(fieldBM);
-}
-
-
-
-    // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem.
-    // Fuehre die vor definierten Aktionen aus.
+// handler for click on the field given as parameter.
+// the cursor is positioned on the field.
 
 
 void SwWrtShell::ClickToField( const SwField& rFld )