Remove remnants of help agent

it was removed with 66714f1888eaccef4eb5341971278ae7dfafa16b
but gobs of code (and UI) still existed to collect the help id
and give it to the missing help agent with various UI visible
options and buttons to control the help agent which isn't
there

Change-Id: I625da27b3046d481e43f4d35d32cc7063a1c6291

3 files changed, 1 insertions, 56 deletions

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7a3a9e3893ad..1ae32e158c6a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -185,8 +185,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
 {
     get(m_pToolTipsCB, "tooltips");
     get(m_pExtHelpCB, "exthelp");
-    get(m_pHelpAgentCB, "helpagent");
-    get(m_pHelpAgentResetBtn, "resethelpagent");
     if (!lcl_HasSystemFilePicker())
         get<VclContainer>("filedlgframe")->Hide();
 #if !defined(MACOSX) && ! ENABLE_GTK
@@ -219,8 +217,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
 
     aLink = LINK( this, OfaMiscTabPage, HelpCheckHdl_Impl );
     m_pToolTipsCB->SetClickHdl( aLink );
-    m_pHelpAgentCB->SetClickHdl( aLink );
-    m_pHelpAgentResetBtn->SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) );
 }
 
 // -----------------------------------------------------------------------
@@ -249,9 +245,6 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
     bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() );
     if ( bChecked != m_pExtHelpCB->GetSavedValue() )
         aHelpOptions.SetExtendedHelp( bChecked );
-    bChecked = m_pHelpAgentCB->IsChecked();
-    if ( bChecked != m_pHelpAgentCB->GetSavedValue() )
-        aHelpOptions.SetHelpAgentAutoStartMode( bChecked );
 
     if ( m_pFileDlgCB->IsChecked() != m_pFileDlgCB->GetSavedValue() )
     {
@@ -300,12 +293,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
     SvtHelpOptions aHelpOptions;
     m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() );
     m_pExtHelpCB->Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
-    m_pHelpAgentCB->Check( aHelpOptions.IsHelpAgentAutoStartMode() );
 
     m_pToolTipsCB->SaveValue();
     m_pExtHelpCB->SaveValue();
-    m_pHelpAgentCB->SaveValue();
-    HelpCheckHdl_Impl(m_pHelpAgentCB);
 
     SvtMiscOptions aMiscOpt;
     m_pFileDlgCB->Check( !aMiscOpt.UseSystemFileDialog() );
@@ -372,21 +362,11 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
 IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl)
 {
     m_pExtHelpCB->Enable( m_pToolTipsCB->IsChecked() );
-    m_pHelpAgentResetBtn->Enable( m_pHelpAgentCB->IsChecked() );
     return 0;
 }
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK_NOARG(OfaMiscTabPage, HelpAgentResetHdl_Impl)
-{
-    SvtHelpOptions().resetAgentIgnoreURLCounter();
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-// -------------------------------------------------------------------
 class CanvasSettings
 {
 public:
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index e1a2436f3fcb..d82dd10bf5cf 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -38,8 +38,6 @@ class OfaMiscTabPage : public SfxTabPage
 private:
     CheckBox*     m_pToolTipsCB;
     CheckBox*     m_pExtHelpCB;
-    CheckBox*     m_pHelpAgentCB;
-    PushButton*   m_pHelpAgentResetBtn;
 
     FixedImage*   m_pFileDlgROImage;
     CheckBox*     m_pFileDlgCB;
@@ -58,7 +56,6 @@ private:
     DECL_LINK( TwoFigureHdl, NumericField* );
     DECL_LINK( TwoFigureConfigHdl, NumericField* );
     DECL_LINK(HelpCheckHdl_Impl, void *);
-    DECL_LINK(HelpAgentResetHdl_Impl, void *);
 #ifdef WNT
     DECL_LINK( OnFileDlgToggled, void* );
 #endif
diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui
index 795896572fe5..2e59fd9a7c97 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -61,45 +61,12 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="helpagent">
-                    <property name="label" translatable="yes">_Help Agent</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="resethelpagent">
-                    <property name="label" translatable="yes">_Reset Help Agent</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
               </object>
             </child>
           </object>
@@ -249,6 +216,7 @@
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="docstatus">
                     <property name="label" translatable="yes">_Printing sets "document modified" status</property>