From 07f1a395098a7a3ac75eb5f05c35aa3982e33e67 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 25 May 2016 13:42:16 +0100
Subject: (nearly) nothing uses GetUniqueId anymore, so remove it.
The odd one out is the usage in Formula, which attempts
to restore focus to a particular window identified by
an unique id. In this case restore focus by keeping a VclPtr
to the desired window.
Change-Id: I1dc335325c109d75745c6bba2e12662e6ae50638
---
cui/source/dialogs/cuihyperdlg.cxx | 9 ---------
cui/source/inc/helpid.hrc | 3 ---
cui/source/options/connpooloptions.cxx | 4 ----
3 files changed, 16 deletions(-)
(limited to 'cui')
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 57601d19cbfa..f0039c9428d5 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -70,18 +70,10 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
}
}
-
//# #
//# Hyperlink - Dialog #
//# #
-
-/*************************************************************************
-|*
-|* Constructor / Destructor
-|*
-|************************************************************************/
-
SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
: IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ),
maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ),
@@ -89,7 +81,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
mbReadOnly ( false ),
mbIsHTMLDoc ( false )
{
- SetUniqueId( HID_HYPERLINK_DIALOG );
mbGrabFocus = true;
// insert pages
std::vector<Image> imgVector;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 6eb74f9a028d..57ba8152989c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -23,7 +23,6 @@
#include <sfx2/sfxcommands.h>
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
@@ -57,8 +56,6 @@
#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN"
#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
-#define HID_HYPERLINK_DIALOG "CUI_HID_HYPERLINK_DIALOG"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index df1949946797..9af9aec71dec 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -87,7 +87,6 @@ namespace offapp
OUString implGetCellText(const DriverPoolingSettings::const_iterator& _rPos, sal_uInt16 _nColId) const;
};
-
DriverListControl::DriverListControl(vcl::Window* _pParent)
:EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_BORDER,
BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT)
@@ -96,8 +95,6 @@ namespace offapp
,m_sNo(CUI_RES(RID_SVXSTR_NO))
{
SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL);
-
- SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK);
}
VCL_BUILDER_FACTORY(DriverListControl)
@@ -108,7 +105,6 @@ namespace offapp
return false;
}
-
bool DriverListControl::isModified() const
{
if (m_aSettings.size() != m_aSavedSettings.size())
--
cgit