[Libreoffice-commits] core.git: cui/source

[Gabor Kelemen]

 cui/source/dialogs/hldoctp.cxx  |    1 -
 cui/source/dialogs/hlinettp.cxx |    1 -
 cui/source/dialogs/hlmailtp.cxx |    1 -
 cui/source/dialogs/iconcdlg.cxx |    6 ------
 cui/source/inc/helpids.h        |    7 -------
 cui/source/inc/hltpbase.hxx     |    1 -
 6 files changed, 17 deletions(-)

New commits:
commit 37bccf09fa8c8a0aa326b4f26e85265e811101ec
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Sun Feb 25 15:15:26 2018 +0100

    Drop unnecessary HIDs from Hyperlink dialog
    
    The defaults from ui files will do just fine
    
    Change-Id: Idd0f3b2f171386142971e7b285abaf869e42717f
    Reviewed-on: https://gerrit.libreoffice.org/50379
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 4d62f215dadd..19c26bb741f7 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -60,7 +60,6 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
 
     m_pCbbPath->Show();
     m_pCbbPath->SetBaseURL(INET_FILE_SCHEME);
-    m_pCbbPath->SetHelpId( HID_HYPERDLG_DOC_PATH );
 
     SetExchangeSupport ();
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 23f2044aefc5..9dd2672f0779 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -53,7 +53,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
     InitStdControls();
 
     m_pCbbTarget->Show();
-    m_pCbbTarget->SetHelpId( HID_HYPERDLG_INET_PATH );
 
     SetExchangeSupport ();
 
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 303407da84b6..1362c0c984ba 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -55,7 +55,6 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
     InitStdControls();
 
     m_pCbbReceiver->Show();
-    m_pCbbReceiver->SetHelpId( HID_HYPERDLG_MAIL_PATH );
 
     SetExchangeSupport ();
 
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index bd04dc4400c8..83ac8c9c58c0 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -24,7 +24,6 @@
 #include <iconcdlg.hxx>
 #include <cuihyperdlg.hxx>
 
-#include <helpids.h>
 #include <unotools/viewoptions.hxx>
 #include <svtools/apearcfg.hxx>
 #include <vcl/mnemonic.hxx>
@@ -169,7 +168,6 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
     m_pIconCtrl->Show();
     m_pIconCtrl->SetChoiceWithCursor();
     m_pIconCtrl->SetSelectionMode( SelectionMode::Single );
-    m_pIconCtrl->SetHelpId( HID_ICCDIALOG_CHOICECTRL );
 
     // ItemSet
     if ( pSet )
@@ -180,12 +178,8 @@ IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
 
     // Buttons
     m_pOKBtn->SetClickHdl   ( LINK( this, IconChoiceDialog, OkHdl ) );
-    m_pOKBtn->SetHelpId( HID_ICCDIALOG_OK_BTN );
     m_pApplyBtn->SetClickHdl   ( LINK( this, IconChoiceDialog, ApplyHdl ) );
-    //m_pApplyBtn->SetHelpId( HID_ICCDIALOG_APPLY_BTN );
-    m_pCancelBtn->SetHelpId( HID_ICCDIALOG_CANCEL_BTN );
     m_pResetBtn->SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) );
-    m_pResetBtn->SetHelpId( HID_ICCDIALOG_RESET_BTN );
     m_pOKBtn->Show();
     m_pApplyBtn->Show();
     m_pCancelBtn->Show();
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index 6ac5734602ba..b20b9223d91f 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -51,13 +51,6 @@
 #define HID_SVX_RESETBUTTON "CUI_HID_SVX_RESETBUTTON"
 #define HID_SVX_REMOVEBUTTON "CUI_HID_SVX_REMOVEBUTTON"
 #define HID_SVX_DESCFIELD "CUI_HID_SVX_DESCFIELD"
-#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN"
-#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL"
-#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH"
-#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH"
-#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH"
-#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN"
-#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN"
 #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
 
 #endif
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index f3a6eb723579..1c30b9429047 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -38,7 +38,6 @@
 #include "dialmgr.hxx"
 #include <sfx2/docfile.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
-#include "helpids.h"
 #include <svx/hlnkitem.hxx>
 
 #include "hlmarkwn.hxx"