fix: #99802# help more accessible

4 files changed, 333 insertions, 59 deletions

diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 96357689c0ad..79984a956ba5 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.hrc,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: cd $ $Date: 2001-11-01 16:54:16 $
+ *  last change: $Author: pb $ $Date: 2002-06-04 08:22:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -254,6 +254,36 @@
 #define STR_HELP_BUTTON_INDEX_OFF               (RID_SFX_APP_START+141)
 #define STR_HELP_BUTTON_SEARCHDIALOG            (RID_SFX_APP_START+142)
 
+#define IMG_HELP_TOOLBOX_HC_INDEX_ON            (RID_SFX_APP_START+150)
+#define IMG_HELP_TOOLBOX_HC_INDEX_OFF           (RID_SFX_APP_START+151)
+#define IMG_HELP_TOOLBOX_HC_START               (RID_SFX_APP_START+152)
+#define IMG_HELP_TOOLBOX_HC_PREV                (RID_SFX_APP_START+153)
+#define IMG_HELP_TOOLBOX_HC_NEXT                (RID_SFX_APP_START+154)
+#define IMG_HELP_TOOLBOX_HC_PRINT               (RID_SFX_APP_START+155)
+#define IMG_HELP_TOOLBOX_HC_BOOKMARKS           (RID_SFX_APP_START+156)
+#define IMG_HELP_TOOLBOX_HC_SEARCHDIALOG        (RID_SFX_APP_START+157)
+#define IMG_HELP_TOOLBOX_HC_COPY                (RID_SFX_APP_START+158)
+
+#define IMG_HELP_TOOLBOX_L_INDEX_ON             (RID_SFX_APP_START+160)
+#define IMG_HELP_TOOLBOX_L_INDEX_OFF            (RID_SFX_APP_START+161)
+#define IMG_HELP_TOOLBOX_L_START                (RID_SFX_APP_START+162)
+#define IMG_HELP_TOOLBOX_L_PREV                 (RID_SFX_APP_START+163)
+#define IMG_HELP_TOOLBOX_L_NEXT                 (RID_SFX_APP_START+164)
+#define IMG_HELP_TOOLBOX_L_PRINT                (RID_SFX_APP_START+165)
+#define IMG_HELP_TOOLBOX_L_BOOKMARKS            (RID_SFX_APP_START+166)
+#define IMG_HELP_TOOLBOX_L_SEARCHDIALOG         (RID_SFX_APP_START+167)
+#define IMG_HELP_TOOLBOX_L_COPY                 (RID_SFX_APP_START+168)
+
+#define IMG_HELP_TOOLBOX_HCL_INDEX_ON           (RID_SFX_APP_START+170)
+#define IMG_HELP_TOOLBOX_HCL_INDEX_OFF          (RID_SFX_APP_START+171)
+#define IMG_HELP_TOOLBOX_HCL_START              (RID_SFX_APP_START+172)
+#define IMG_HELP_TOOLBOX_HCL_PREV               (RID_SFX_APP_START+173)
+#define IMG_HELP_TOOLBOX_HCL_NEXT               (RID_SFX_APP_START+174)
+#define IMG_HELP_TOOLBOX_HCL_PRINT              (RID_SFX_APP_START+175)
+#define IMG_HELP_TOOLBOX_HCL_BOOKMARKS          (RID_SFX_APP_START+176)
+#define IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG       (RID_SFX_APP_START+177)
+#define IMG_HELP_TOOLBOX_HCL_COPY               (RID_SFX_APP_START+178)
+
 #endif // #ifndef _SFX_APP_HRC
 
 // ******************************************************************* EOF
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index d7bf503bea8a..9fbc8eb3d7ce 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: newhelp.cxx,v $
  *
- *  $Revision: 1.78 $
+ *  $Revision: 1.79 $
  *
- *  last change: $Author: as $ $Date: 2002-05-23 13:15:01 $
+ *  last change: $Author: pb $ $Date: 2002-06-04 08:22:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -198,6 +198,12 @@
 #ifndef _SVTOOLS_IMAGEMGR_HXX
 #include <svtools/imagemgr.hxx>
 #endif
+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
+#include <svtools/miscopt.hxx>
+#endif
+#ifndef _SVTOOLS_IMGDEF_HXX
+#include <svtools/imgdef.hxx>
+#endif
 
 #include <ucbhelper/content.hxx>
 #include <vcl/msgbox.hxx>
@@ -226,6 +232,8 @@ extern void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark ); // s
 #define INDEXWIN_ID         2
 #define TEXTWIN_ID          3
 
+#define TOOLBOX_OFFSET      3
+
 #define TBI_INDEX           1001
 #define TBI_BACKWARD        1002
 #define TBI_FORWARD         1003
@@ -1790,6 +1798,20 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
+void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
+{
+    Window::DataChanged( rDCEvt );
+
+    if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
+           ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) &&
+         ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
+    {
+        SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) );
+    }
+}
+
+// -----------------------------------------------------------------------
+
 void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
 {
     if ( !pCPage )
@@ -1968,40 +1990,21 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
 
     aToolBox.SetHelpId( HID_HELP_TOOLBOX );
 
-    aToolBox.InsertItem( TBI_INDEX, aIndexOffImage );
-    aToolBox.SetQuickHelpText( TBI_INDEX, aIndexOffText );
+    aToolBox.InsertItem( TBI_INDEX, aIndexOffText );
     aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
     aToolBox.InsertSeparator();
-    aToolBox.InsertItem( TBI_BACKWARD, Image( SfxResId( IMG_HELP_TOOLBOX_PREV ) ) );
-    aToolBox.SetQuickHelpText( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) );
+    aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) );
     aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
-    aToolBox.InsertItem( TBI_FORWARD, Image( SfxResId( IMG_HELP_TOOLBOX_NEXT ) ) );
-    aToolBox.SetQuickHelpText( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) );
+    aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) );
     aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
-    aToolBox.InsertItem( TBI_START, Image( SfxResId( IMG_HELP_TOOLBOX_START ) ) );
-    aToolBox.SetQuickHelpText( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) );
+    aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) );
     aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
     aToolBox.InsertSeparator();
-    aToolBox.InsertItem( TBI_PRINT, Image( SfxResId( IMG_HELP_TOOLBOX_PRINT ) ) );
-    aToolBox.SetQuickHelpText( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) );
+    aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) );
     aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
-    aToolBox.InsertItem( TBI_BOOKMARKS, Image( SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
-    aToolBox.SetQuickHelpText( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) );
+    aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) );
     aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
-
-/*!!! pb: searchdialog problem not fixable til 6.0 final
-    aToolBox.InsertItem( TBI_SEARCHDIALOG, Image( SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
-    aToolBox.SetQuickHelpText( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) );
-    aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
-*/
-
-    Size a3Size = LogicToPixel( Size( 0, 3 ), MAP_APPFONT );
-    Size a14Size = LogicToPixel( Size( 0, 14 ), MAP_APPFONT );
-    Size aSize = aToolBox.CalcWindowSizePixel();
-    long nY = a3Size.Height() + ( ( a14Size.Height() - aSize.Height() ) / 2 );
-    aSize.Height() += nY + 3;
-    aToolBox.SetPosSizePixel( Point( 0, nY ), aSize );
-    aToolBox.SetOutStyle( TOOLBOX_STYLE_FLAT );
+    InitToolBoxImages();
     aToolBox.Show();
 
     aSelectTimer.SetTimeoutHdl( LINK( this, SfxHelpTextWindow_Impl, SelectHdl ) );
@@ -2010,6 +2013,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
     char* pEnv = getenv( "help_debug" );
     if ( pEnv )
         bIsDebug = sal_True;
+
+    SvtMiscOptions().AddListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
 }
 
 // -----------------------------------------------------------------------
@@ -2019,6 +2024,7 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
     sfx2::RemoveFromTaskPaneList( &aToolBox );
 
     bIsInClose = sal_True;
+    SvtMiscOptions().RemoveListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
 }
 
 // -----------------------------------------------------------------------
@@ -2063,6 +2069,46 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
 
 // -----------------------------------------------------------------------
 
+void SfxHelpTextWindow_Impl::InitToolBoxImages()
+{
+    sal_Bool bLarge = ( SvtMiscOptions().GetSymbolSet() == SFX_SYMBOLS_LARGE );
+    sal_Bool bHiContrast = GetBackground().GetColor().IsDark();
+
+    aIndexOnImage = Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_ON : IMG_HELP_TOOLBOX_L_INDEX_ON
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
+    aIndexOffImage = Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_OFF : IMG_HELP_TOOLBOX_L_INDEX_OFF
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+    aToolBox.SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage );
+
+    aToolBox.SetItemImage( TBI_BACKWARD, Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PREV : IMG_HELP_TOOLBOX_L_PREV
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
+    aToolBox.SetItemImage( TBI_FORWARD, Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_NEXT : IMG_HELP_TOOLBOX_L_NEXT
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
+    aToolBox.SetItemImage( TBI_START, Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_START : IMG_HELP_TOOLBOX_L_START
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
+    aToolBox.SetItemImage( TBI_PRINT, Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PRINT : IMG_HELP_TOOLBOX_L_PRINT
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
+    aToolBox.SetItemImage( TBI_BOOKMARKS, Image( SfxResId(
+        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_BOOKMARKS : IMG_HELP_TOOLBOX_L_BOOKMARKS
+               : bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
+
+    Size aSize = aToolBox.CalcWindowSizePixel();
+    aSize.Height() += TOOLBOX_OFFSET;
+    aToolBox.SetPosSizePixel( Point( 0, TOOLBOX_OFFSET ), aSize );
+
+    SvtMiscOptions aMiscOptions;
+    if ( aMiscOptions.GetToolboxStyle() != aToolBox.GetOutStyle() )
+        aToolBox.SetOutStyle( aMiscOptions.GetToolboxStyle() );
+}
+
+// -----------------------------------------------------------------------
+
 IMPL_LINK( SfxHelpTextWindow_Impl, SelectHdl, Timer*, EMPTYARG )
 {
     try
@@ -2105,6 +2151,16 @@ IMPL_LINK( SfxHelpTextWindow_Impl, SelectHdl, Timer*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
+IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions )
+{
+    InitToolBoxImages();
+    Resize();
+    aToolBox.Invalidate();
+    return 0;
+}
+
+// -----------------------------------------------------------------------
+
 void SfxHelpTextWindow_Impl::Resize()
 {
     Size aWinSize = GetOutputSizePixel();
@@ -2112,7 +2168,7 @@ void SfxHelpTextWindow_Impl::Resize()
     aSize.Width() = aWinSize.Width();
     aToolBox.SetSizePixel( aSize );
 
-    long nToolBoxHeight = aSize.Height();
+    long nToolBoxHeight = aSize.Height() + TOOLBOX_OFFSET;
     aSize = aWinSize;
     aSize.Height() -= nToolBoxHeight;
     pTextWin->SetPosSizePixel( Point( 0, nToolBoxHeight  ), aSize );
@@ -2129,38 +2185,45 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
         const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent();
         Window* pCmdWin = rNEvt.GetWindow();
 
-        if ( //pCmdEvt->IsMouseEvent() &&
-             pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
+        if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
         {
-            // link at current mouse position ?
-            Point aPos = pCmdEvt->GetMousePosPixel();
+            sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetMenuColor().IsDark();
+            Point aPos;
+            if ( pCmdEvt->IsMouseEvent() )
+                aPos = pCmdEvt->GetMousePosPixel();
+            else
+                aPos = Point( pTextWin->GetPosPixel().X() + 20, 20 );
             aPos.Y() += pTextWin->GetPosPixel().Y();
             PopupMenu aMenu;
             if ( bIsIndexOn )
-                aMenu.InsertItem( TBI_INDEX, aIndexOffText, aIndexOffImage );
+                aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId(
+                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
             else
-                aMenu.InsertItem( TBI_INDEX, aIndexOnText, aIndexOnImage );
+                aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId(
+                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
             aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), Image( SfxResId( IMG_HELP_TOOLBOX_PREV ) ) );
+            aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
             aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
             aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
-            aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), Image( SfxResId( IMG_HELP_TOOLBOX_NEXT ) ) );
+            aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
             aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
             aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
-            aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), Image( SfxResId( IMG_HELP_TOOLBOX_START ) ) );
+            aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
             aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), Image( SfxResId( IMG_HELP_TOOLBOX_PRINT ) ) );
+            aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
             aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
-            aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), Image( SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
+            aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
             aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
-/*!!! pb: searchdialog problem not fixable til 6.0 final
-            aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), Image( SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
-            aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
-*/
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_COPY, GET_SLOT_NAME( SID_COPY ), Image( SfxResId( IMG_HELP_TOOLBOX_COPY ) ) );
+            aMenu.InsertItem( TBI_COPY, GET_SLOT_NAME( SID_COPY ),
+                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
             aMenu.SetHelpId( TBI_COPY, SID_COPY );
             aMenu.EnableItem( TBI_COPY, HasSelection() );
 
@@ -2217,18 +2280,33 @@ void SfxHelpTextWindow_Impl::GetFocus()
 
 // -----------------------------------------------------------------------
 
+void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
+{
+    Window::DataChanged( rDCEvt );
+
+    if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
+           ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) &&
+         ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
+    {
+        SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFaceColor() ) );
+        InitToolBoxImages();
+    }
+}
+
+// -----------------------------------------------------------------------
+
 void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn )
 {
     bIsIndexOn = bOn;
     if ( bIsIndexOn )
     {
         aToolBox.SetItemImage( TBI_INDEX, aIndexOffImage );
-        aToolBox.SetQuickHelpText( TBI_INDEX, aIndexOffText );
+        aToolBox.SetItemText( TBI_INDEX, aIndexOffText );
     }
     else
     {
         aToolBox.SetItemImage( TBI_INDEX, aIndexOnImage );
-        aToolBox.SetQuickHelpText( TBI_INDEX, aIndexOnText );
+        aToolBox.SetItemText( TBI_INDEX, aIndexOnText );
     }
 }
 
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index cf4a8963fddc..f4a6e64369ca 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: newhelp.hxx,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: pb $ $Date: 2002-05-15 06:59:39 $
+ *  last change: $Author: pb $ $Date: 2002-06-04 08:22:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -366,6 +366,7 @@ public:
 
     virtual void        Resize();
     virtual long        PreNotify( NotifyEvent& rNEvt );
+    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
 
     void                SetDoubleClickHdl( const Link& rLink );
     inline void         SetSelectFactoryHdl( const Link& rLink ) { aSelectFactoryLink = rLink; }
@@ -396,7 +397,9 @@ public:
 
 // class SfxHelpTextWindow_Impl ------------------------------------------
 
+class SvtMiscOptions;
 class SfxHelpWindow_Impl;
+
 class SfxHelpTextWindow_Impl : public Window
 {
 private:
@@ -419,8 +422,10 @@ private:
     Image                   aIndexOffImage;
 
     sal_Bool                HasSelection() const;
+    void                    InitToolBoxImages();
 
     DECL_LINK(              SelectHdl, Timer* );
+    DECL_LINK(              NotifyHdl, SvtMiscOptions* );
 
 public:
     SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent );
@@ -429,6 +434,7 @@ public:
     virtual void            Resize();
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual void            GetFocus();
+    virtual void            DataChanged( const DataChangedEvent& rDCEvt );
 
     inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >
                             getFrame() const { return xFrame; }
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index dba200f99d46..4ffd226ab7fa 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: newhelp.src,v $
  *
- *  $Revision: 1.71 $
+ *  $Revision: 1.72 $
  *
- *  last change: $Author: kz $ $Date: 2002-02-05 21:15:26 $
+ *  last change: $Author: pb $ $Date: 2002-06-04 08:22:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,7 @@ Window WIN_HELP_INDEX
                 Text[ arabic ] = "���������";
                 Text[ finnish ] = "Contents";
                 Text[ catalan ] = "Contents";
+                Text[ thai ] = "เนื้อหา";
             };
             PageItem
             {
@@ -140,6 +141,7 @@ Window WIN_HELP_INDEX
                 Text[ arabic ] = "����";
                 Text[ catalan ] = "�ndice";
                 Text[ finnish ] = "Hakemisto";
+                Text[ thai ] = "ดัชนี";
             };
             PageItem
             {
@@ -167,6 +169,7 @@ Window WIN_HELP_INDEX
                 Text[ catalan ] = "Buscar";
                 Text[ finnish ] = "Etsi";
                 Text[ language_user1 ] = "pb: the correct english text here must be 'Search' (said VK and FPE)";
+                Text[ thai ] = "หา";
             };
             PageItem
             {
@@ -193,6 +196,7 @@ Window WIN_HELP_INDEX
                 Text[ turkish ] = "Bookmarks";
                 Text[ arabic ] = "Bookmarks";
                 Text[ catalan ] = "Bookmarks";
+                Text[ thai ] = "ตัวคั่น";
             };
         };
     };
@@ -229,6 +233,7 @@ TabPage TP_HELP_INDEX
         Text[ arabic ] = "����� �����";
         Text[ catalan ] = "~T�rmino de b�squeda";
         Text[ finnish ] = "~Etsitt�v� termi";
+        Text[ thai ] = "~ค้นหาเงื่อนไข";
     };
     ComboBox CB_INDEX
     {
@@ -261,6 +266,7 @@ TabPage TP_HELP_INDEX
         Text[ arabic ] = "���";
         Text[ catalan ] = "~Visualizar";
         Text[ finnish ] = "~N�yt�";
+        Text[ thai ] = "แ~สดงผล";
     };
 };
 
@@ -295,6 +301,7 @@ TabPage TP_HELP_SEARCH
         Text[ arabic ] = "����� �����";
         Text[ catalan ] = "~T�rmino de b�squeda";
         Text[ finnish ] = "E~tsitt�v� termi";
+        Text[ thai ] = "ค้~นหาเงื่อนไข";
     };
     ComboBox ED_SEARCH
     {
@@ -328,6 +335,7 @@ TabPage TP_HELP_SEARCH
         Text[ arabic ] = "���";
         Text[ catalan ] = "Buscar";
         Text[ finnish ] = "~Etsi";
+        Text[ thai ] = "~หา";
     };
     CheckBox CB_FULLWORDS
     {
@@ -354,6 +362,7 @@ TabPage TP_HELP_SEARCH
         Text[ turkish ] = "~Complete words only";
         Text[ arabic ] = "~Complete words only";
         Text[ catalan ] = "~Complete words only";
+        Text[ thai ] = "คำที่~สมบูรณ์เท่านั้น";
     };
     CheckBox CB_SCOPE
     {
@@ -380,6 +389,7 @@ TabPage TP_HELP_SEARCH
         Text[ arabic ] = "~Search headings only";
         Text[ catalan ] = "~Search headings only";
         Text[ finnish ] = "Etsi ~vain otsikoista";
+        Text[ thai ] = "หาใน~ส่วนหัวอย่างเดียว";
     };
     ListBox LB_RESULT
     {
@@ -412,6 +422,7 @@ TabPage TP_HELP_SEARCH
         Text[ arabic ] = "���";
         Text[ catalan ] = "~Visualizar";
         Text[ finnish ] = "~N�yt�";
+        Text[ thai ] = "แ~สดงผล";
     };
 };
 
@@ -446,6 +457,7 @@ TabPage TP_HELP_BOOKMARKS
         Text[ turkish ] = "Bookmarks";
         Text[ arabic ] = "Bookmarks";
         Text[ catalan ] = "Bookmarks";
+        Text[ thai ] = "~ตัวคั่น";
     };
     ListBox LB_BOOKMARKS
     {
@@ -479,6 +491,7 @@ TabPage TP_HELP_BOOKMARKS
         Text[ arabic ] = "���";
         Text[ catalan ] = "~Visualizar";
         Text[ finnish ] = "~N�yt�";
+        Text[ thai ] = "แ~สดงผล";
     };
 };
 
@@ -598,6 +611,7 @@ String STR_HELP_WINDOW_TITLE
     Text[ arabic ] = "%PRODUCTNAME ������";
     Text[ catalan ] = "%PRODUCTNAME Ayuda";
     Text[ finnish ] = " Ohjelman %PRODUCTNAME ohje";
+    Text[ thai ] = "ตัวช่วยเหลือ%PRODUCTNAME ";
 };
 String STR_HELP_BUTTON_INDEX_ON
 {
@@ -622,6 +636,7 @@ String STR_HELP_BUTTON_INDEX_ON
     Text[ arabic ] = "����";
     Text[ catalan ] = "�ndice";
     Text[ finnish ] = "Hakemisto";
+    Text[ thai ] = "แสดงการนำทางบานหน้าต่าง";
 };
 String STR_HELP_BUTTON_INDEX_OFF
 {
@@ -646,6 +661,7 @@ String STR_HELP_BUTTON_INDEX_OFF
     Text[ turkish ] = "Hide navigation area";
     Text[ arabic ] = "Hide navigation area";
     Text[ catalan ] = "Hide navigation area";
+    Text[ thai ] = "ซ่อนการนำทางบานหน้าต่าง";
 };
 String STR_HELP_BUTTON_START
 {
@@ -670,6 +686,7 @@ String STR_HELP_BUTTON_START
     Text[ arabic ] = "���� �����";
     Text[ catalan ] = "P�gina de inicio";
     Text[ finnish ] = "Ensimm�inen sivu";
+    Text[ thai ] = "หน้าแรก";
 };
 String STR_HELP_BUTTON_PREV
 {
@@ -694,6 +711,7 @@ String STR_HELP_BUTTON_PREV
     Text[ arabic ] = "������ �������";
     Text[ catalan ] = "P�gina anterior";
     Text[ finnish ] = "Edellinen sivu";
+    Text[ thai ] = "หน้าก่อน";
 };
 String STR_HELP_BUTTON_NEXT
 {
@@ -718,6 +736,7 @@ String STR_HELP_BUTTON_NEXT
     Text[ arabic ] = "������ �������";
     Text[ catalan ] = "P�gina siguiente";
     Text[ finnish ] = "Seuraava sivu";
+    Text[ thai ] = "หน้าถัดไป";
 };
 String STR_HELP_BUTTON_PRINT
 {
@@ -742,6 +761,7 @@ String STR_HELP_BUTTON_PRINT
     Text[ arabic ] = "�����";
     Text[ catalan ] = "Imprimir";
     Text[ finnish ] = "Tulosta";
+    Text[ thai ] = "พิมพ์...";
 };
 String STR_HELP_BUTTON_ADDBOOKMARK
 {
@@ -766,6 +786,7 @@ String STR_HELP_BUTTON_ADDBOOKMARK
     Text[ turkish ] = "Add to bookmarks";
     Text[ arabic ] = "Add to bookmarks";
     Text[ catalan ] = "Add to bookmarks";
+    Text[ thai ] = "เพิ่มถึงตัวคั่น...";
 };
 String STR_HELP_BUTTON_SEARCHDIALOG
 {
@@ -790,6 +811,7 @@ String STR_HELP_BUTTON_SEARCHDIALOG
     Text[ turkish ] = "Find...";
     Text[ arabic ] = "Find...";
     Text[ catalan ] = "Find...";
+    Text[ thai ] = "หา...";
 };
 String STR_HELP_BUTTON_SOURCEVIEW
 {
@@ -816,6 +838,7 @@ String STR_HELP_BUTTON_SOURCEVIEW
     Text[ turkish ] = "HTML kaynak kodu";
     Text[ catalan ] = "HTML Source";
     Text[ finnish ] = "HTML-l�hde";
+    Text[ thai ] = "แหล่ง HTML ";
 };
 
 String STR_HELP_FIRST_MESSAGE
@@ -841,6 +864,7 @@ String STR_HELP_FIRST_MESSAGE
     Text[ arabic ] = "Help is started...";
     Text[ catalan ] = "Help is started...";
     Text[ finnish ] = "Ohjetoiminto k�ynnistet��n";
+    Text[ thai ] = "เริ่มตัวช่วย...";
 };
 String STR_HELP_FIRST_HTML
 {
@@ -886,6 +910,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
         GROUP = TRUE ;
         LEFT = TRUE ;
         TEXT[ catalan ] = "Bookmark:";
+        TEXT[ thai ] = "ตัวคั่น:";
     };
     Edit ED_BOOKMARK_TITLE
     {
@@ -939,6 +964,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
         TEXT[ turkish ] = "Rename bookmark";
         TEXT[ arabic ] = "Rename bookmark";
         TEXT[ catalan ] = "Rename bookmark";
+        TEXT[ thai ] = "เปลี่ยนชื่อตัวคั่น";
     };
     TEXT[ english_us ] = "Add to Bookmarks";
     TEXT[ portuguese ] = "Adicionar marcador";
@@ -960,6 +986,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
     TEXT[ turkish ] = "Add to Bookmarks";
     TEXT[ arabic ] = "Add to Bookmarks";
     TEXT[ catalan ] = "Add to Bookmarks";
+    TEXT[ thai ] = "เพิ่มถึงตัวคั่น";
 };
 
 Menu MENU_HELP_BOOKMARKS
@@ -992,6 +1019,7 @@ Menu MENU_HELP_BOOKMARKS
             Text[ turkish ] = "New...";
             Text[ arabic ] = "New...";
             Text[ catalan ] = "New...";
+            Text[ thai ] = "แสดงผล";
         };
         MenuItem
         {
@@ -1023,6 +1051,7 @@ Menu MENU_HELP_BOOKMARKS
             Text[ turkish ] = "Rename...";
             Text[ arabic ] = "Rename...";
             Text[ catalan ] = "Rename...";
+            Text[ thai ] = "เปลี่ยนชื่อ...";
         };
         MenuItem
         {
@@ -1050,6 +1079,7 @@ Menu MENU_HELP_BOOKMARKS
             Text[ turkish ] = "Delete";
             Text[ arabic ] = "Delete";
             Text[ catalan ] = "Delete";
+            Text[ thai ] = "ลบ";
         };
     };
 };
@@ -1080,14 +1110,144 @@ InfoBox RID_INFO_NOSEARCHRESULTS
     MESSAGE[ turkish ] = "No themes found.";
     MESSAGE[ arabic ] = "No themes found.";
     MESSAGE[ catalan ] = "No themes found.";
+    MESSAGE[ thai ] = "ไม่พบหัวข้อ";
 };
 
+Image IMG_HELP_TOOLBOX_HC_INDEX_ON
+{
+    ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_INDEX_OFF
+{
+    ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_START
+{
+    ImageBitmap = Bitmap { File = "sch06303.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_PREV
+{
+    ImageBitmap = Bitmap { File = "sch06301.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_NEXT
+{
+    ImageBitmap = Bitmap { File = "sch06300.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_PRINT
+{
+    ImageBitmap = Bitmap { File = "sch05504.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_BOOKMARKS
+{
+    ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG
+{
+    ImageBitmap = Bitmap { File = "search_small_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HC_COPY
+{
+    ImageBitmap = Bitmap { File = "sch05711.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
 
+Image IMG_HELP_TOOLBOX_L_INDEX_ON
+{
+    ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_INDEX_OFF
+{
+    ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_START
+{
+    ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_PREV
+{
+    ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_NEXT
+{
+    ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_PRINT
+{
+    ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_BOOKMARKS
+{
+    ImageBitmap = Bitmap { File = "favourite.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
+{
+    ImageBitmap = Bitmap { File = "search_large.bmp" ; };
+    MASKCOLOR_GREY
+};
+Image IMG_HELP_TOOLBOX_L_COPY
+{
+    ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
+    MASKCOLOR_GREY
+};
 
-
-
-
-
-
-
+Image IMG_HELP_TOOLBOX_HCL_INDEX_ON
+{
+    ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF
+{
+    ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_START
+{
+    ImageBitmap = Bitmap { File = "lch06303.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_PREV
+{
+    ImageBitmap = Bitmap { File = "lch06301.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_NEXT
+{
+    ImageBitmap = Bitmap { File = "lch06300.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_PRINT
+{
+    ImageBitmap = Bitmap { File = "lch05504.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS
+{
+    ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG
+{
+    ImageBitmap = Bitmap { File = "search_large_h.bmp" ; };
+    MASKCOLOR_MAGENTA
+};
+Image IMG_HELP_TOOLBOX_HCL_COPY
+{
+    ImageBitmap = Bitmap { File = "lch05711.bmp" ; };
+    MASKCOLOR_MAGENTA
+};