desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 ----
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 --
desktop/source/inc/helpid.hrc | 3 ---
3 files changed, 9 deletions(-)
New commits:
commit a9aac784c29777eb24d68e25efe54e0b67ede001
Author: Gabor Kelemen <kelem...@ubuntu.com>
Date: Mon May 8 02:30:55 2017 +0200
Remove unnecessary HIDs - the defaults will work just fine
Change-Id: I1c67634c7da32daa48fdc962591f75466d145508
Reviewed-on: https://gerrit.libreoffice.org/37408
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 0c2d527055a1..38283f9d4084 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -146,8 +146,6 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog
*pParentDialog)
setExtensionManager(pParentDialog->getExtensionManager());
m_pParent = pParentDialog;
-
- SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
}
VCL_BUILDER_DECL_FACTORY(ExtBoxWithBtns)
@@ -486,8 +484,6 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent,
TheExtensionManager *pManager,
m_pExtensionBox->InitFromDialog(this);
- m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS );
- m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE );
m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE );
m_pOptionsBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleOptionsBtn ) );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 4cd3d38587f6..b92485f4c44d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -194,8 +194,6 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
void ExtensionBox_Impl::Init()
{
- SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
-
m_pScrollBar = VclPtr<ScrollBar>::Create( this, WB_VERT );
m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) );
m_pScrollBar->EnableDrag();
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 5a662867baa4..41c7893c6927 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -20,11 +20,8 @@
#ifndef INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
-#define HID_EXTENSION_MANAGER_LISTBOX
"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX"
-#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS
"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS"
#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE
"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"
#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE
"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"
-#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE
"DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE"
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
