[Libreoffice-commits] core.git: cui/source dbaccess/inc dbaccess/source extensions/inc extensions/source formula/source framework/inc framework/source include/formula include/sfx2 include/tools include/vcl reportdesign/inc reportdesign/source rsc/source sc/source sd/source sfx2/source starmath/source svx/inc svx/source vcl/inc vcl/source xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Wed May 25 13:24:51 UTC 2016
cui/source/dialogs/cuihyperdlg.cxx | 9 -
cui/source/inc/helpid.hrc | 3
cui/source/options/connpooloptions.cxx | 4
dbaccess/inc/dbaccess_helpid.hrc | 19 --
dbaccess/source/ui/app/AppController.cxx | 1
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 3
dbaccess/source/ui/app/AppDetailView.cxx | 5
dbaccess/source/ui/app/AppView.cxx | 3
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 1
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 3
dbaccess/source/ui/dlg/sqlmessage.cxx | 1
extensions/inc/bibliography.hrc | 1
extensions/source/abpilot/abspilot.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/propctrlr/browserline.cxx | 6
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 4
formula/source/ui/dlg/formula.cxx | 119 ++++-------------
formula/source/ui/dlg/funcpage.cxx | 1
formula/source/ui/dlg/parawin.cxx | 6
framework/inc/helpid.hrc | 27 ---
framework/source/classes/resource.src | 1
framework/source/uielement/macrosmenucontroller.cxx | 1
framework/source/uielement/statusbarwrapper.cxx | 2
include/formula/formdata.hxx | 8 -
include/formula/formula.hxx | 2
include/sfx2/basedlgs.hxx | 10 -
include/tools/rc.h | 5
include/vcl/tabctrl.hxx | 1
include/vcl/window.hxx | 3
reportdesign/inc/helpids.hrc | 4
reportdesign/source/ui/report/EndMarker.cxx | 3
reportdesign/source/ui/report/SectionWindow.cxx | 1
reportdesign/source/ui/report/StartMarker.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 2
rsc/source/parser/rscicpx.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 1
sc/source/ui/view/gridwin.cxx | 1
sc/source/ui/view/preview.cxx | 1
sd/source/ui/dlg/animobjs.cxx | 3
sd/source/ui/slideshow/showwin.cxx | 1
sd/source/ui/view/drviews5.cxx | 3
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 1
sd/source/ui/view/sdwindow.cxx | 4
sfx2/source/dialog/basedlgs.cxx | 10 -
sfx2/source/dialog/dockwin.cxx | 36 -----
starmath/source/view.cxx | 1
svx/inc/fmhelp.hrc | 2
svx/inc/helpid.hrc | 1
svx/source/form/fmPropBrw.cxx | 1
svx/source/form/tbxform.cxx | 7 -
svx/source/tbxctrls/fillctrl.cxx | 4
vcl/inc/window.h | 1
vcl/source/control/tabctrl.cxx | 8 -
vcl/source/window/resource.cxx | 2
vcl/source/window/window2.cxx | 10 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
60 files changed, 42 insertions(+), 334 deletions(-)
New commits:
commit 07f1a395098a7a3ac75eb5f05c35aa3982e33e67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 25 13:42:16 2016 +0100
(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
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 57601d1..f0039c9 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 6eb74f9..57ba815 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 df19499..9af9aec7 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())
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index d005d98..3280fe4 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -23,9 +23,7 @@
#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER"
#define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER"
-#define UID_DATABROWSE_DATAWINDOW "DBACCESS_UID_DATABROWSE_DATAWINDOW"
#define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW"
-#define UID_CTL_CONTENT "DBACCESS_UID_CTL_CONTENT"
#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX"
#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN"
@@ -41,9 +39,6 @@
#define HID_BROWSER_QUERY_CREATE_TEXT "DBACCESS_HID_BROWSER_QUERY_CREATE_TEXT"
-#define UID_SQLERROR_BUTTONMORE "DBACCESS_UID_SQLERROR_BUTTONMORE"
-
-
#define HID_CTL_QRYDGNTAB "DBACCESS_HID_CTL_QRYDGNTAB"
#define HID_CTL_QRYDGNCRIT "DBACCESS_HID_CTL_QRYDGNCRIT"
#define HID_QRYDGN_ROW_VISIBLE "DBACCESS_HID_QRYDGN_ROW_VISIBLE"
@@ -97,8 +92,6 @@
#define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME"
#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME"
-#define UID_DLGINDEX_INDEXDETAILS_BACK "DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK"
-#define UID_DLGINDEX_INDEXDETAILS_MAIN "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN"
#define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD"
#define HID_DLGINDEX_INDEXDETAILS_SORTORDER "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER"
@@ -116,31 +109,20 @@
#define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH"
#define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
-#define UID_APP_VIEW "DBACCESS_UID_APP_VIEW"
#define HID_APP_TABLE_TREE "DBACCESS_HID_APP_TABLE_TREE"
#define HID_APP_FORM_TREE "DBACCESS_HID_APP_FORM_TREE"
#define HID_APP_QUERY_TREE "DBACCESS_HID_APP_QUERY_TREE"
#define HID_APP_REPORT_TREE "DBACCESS_HID_APP_REPORT_TREE"
-#define UID_APP_DETAIL_VIEW "DBACCESS_UID_APP_DETAIL_VIEW"
-#define UID_APP_VIEW_BORDER_WIN "DBACCESS_UID_APP_VIEW_BORDER_WIN"
#define HID_APP_CREATION_LIST "DBACCESS_HID_APP_CREATION_LIST"
-#define UID_APP_SWAP_VIEW "DBACCESS_UID_APP_SWAP_VIEW"
#define HID_APP_SWAP_ICONCONTROL "DBACCESS_HID_APP_SWAP_ICONCONTROL"
#define HID_APP_HELP_TEXT "DBACCESS_HID_APP_HELP_TEXT"
-#define UID_APP_DATABASE_VIEW "DBACCESS_UID_APP_DATABASE_VIEW"
-#define UID_APP_TASKS_VIEW "DBACCESS_UID_APP_TASKS_VIEW"
-#define UID_APP_CONTAINER_VIEW "DBACCESS_UID_APP_CONTAINER_VIEW"
-#define UID_APP_TASKS_WINDOW "DBACCESS_UID_APP_TASKS_WINDOW"
#define HID_APP_DESCRIPTION_TEXT "DBACCESS_HID_APP_DESCRIPTION_TEXT"
-#define UID_APP_DETAILPAGE_HELPER "DBACCESS_UID_APP_DETAILPAGE_HELPER"
#define HID_APP_VIEW_PREVIEW_CB "DBACCESS_HID_APP_VIEW_PREVIEW_CB"
#define HID_APP_VIEW_PREVIEW_1 "DBACCESS_HID_APP_VIEW_PREVIEW_1"
#define HID_APP_VIEW_PREVIEW_2 "DBACCESS_HID_APP_VIEW_PREVIEW_2"
#define HID_TABDESIGN_HELPTEXT "DBACCESS_HID_TABDESIGN_HELPTEXT"
-#define UID_APP_VIEW_HORZ_SPLIT "DBACCESS_UID_APP_VIEW_HORZ_SPLIT"
-#define UID_APP_VIEW_PREVIEW_1 "DBACCESS_UID_APP_VIEW_PREVIEW_1"
#define HID_APP_VIEW_PREVIEW_3 "DBACCESS_HID_APP_VIEW_PREVIEW_3"
@@ -148,7 +130,6 @@
#define HID_DBWIZ_NEXT "DBACCESS_HID_DBWIZ_NEXT"
#define HID_DBWIZ_CANCEL "DBACCESS_HID_DBWIZ_CANCEL"
#define HID_DBWIZ_FINISH "DBACCESS_HID_DBWIZ_FINISH"
-#define UID_DBWIZ_HELP "DBACCESS_UID_DBWIZ_HELP"
#define HID_BROWSER_ADMINISTRATE "DBACCESS_HID_BROWSER_ADMINISTRATE"
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 01fe86d..d1ed43c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -420,7 +420,6 @@ void SAL_CALL OApplicationController::disposing()
bool OApplicationController::Construct(vcl::Window* _pParent)
{
setView( VclPtr<OApplicationView>::Create( _pParent, getORB(), *this, m_ePreviewMode ) );
- getView()->SetUniqueId(UID_APP_VIEW);
// late construction
bool bSuccess = false;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index d850c9d..836059f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -200,8 +200,6 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo
m_aTBPreview->EnableMenuStrings();
m_aTBPreview->Enable();
- m_aBorder->SetUniqueId(UID_APP_VIEW_PREVIEW_1);
-
m_aPreview->SetHelpId(HID_APP_VIEW_PREVIEW_1);
m_pTablePreview.set( VclPtr<OTablePreviewWindow>::Create(m_aBorder.get(), WB_READONLY | WB_DIALOGCONTROL ) );
@@ -211,7 +209,6 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo
m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview );
- SetUniqueId(UID_APP_DETAILPAGE_HELPER);
for (VclPtr<DBTreeListBox> & rpBox : m_pLists)
rpBox = nullptr;
ImplInitSettings();
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 6d73785..6a481b3 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -349,7 +349,6 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai
,m_aFL(VclPtr<FixedLine>::Create(this,WB_VERT))
,m_pDetailView(_pDetailView)
{
- SetUniqueId(UID_APP_TASKS_WINDOW);
m_aCreation->SetHelpId(HID_APP_CREATION_LIST);
m_aCreation->SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
m_aHelpText->SetHelpId(HID_APP_HELP_TEXT);
@@ -529,7 +528,6 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
,m_aContainer(VclPtr<dbaui::OTitleWindow>::Create(this,0,WB_BORDER | WB_DIALOGCONTROL) )
,m_rBorderWin(_rParent)
{
- SetUniqueId(UID_APP_DETAIL_VIEW);
ImplInitSettings();
m_pControlHelper = VclPtr<OAppDetailPageHelper>::Create(m_aContainer.get(),m_rBorderWin,_ePreviewMode);
@@ -540,10 +538,8 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
pTasks->Show();
pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly());
m_aTasks->setChildWindow(pTasks);
- m_aTasks->SetUniqueId(UID_APP_TASKS_VIEW);
m_aTasks->Show();
- m_aContainer->SetUniqueId(UID_APP_CONTAINER_VIEW);
m_aContainer->Show();
const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
@@ -552,7 +548,6 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
set(m_aContainer.get(),m_aTasks.get());
m_aHorzSplitter->Show();
- m_aHorzSplitter->SetUniqueId(UID_APP_VIEW_HORZ_SPLIT);
setSplitter(m_aHorzSplitter.get());
}
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 8365235..cb07e83 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -71,10 +71,8 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
m_pPanel->SetBorderStyle(WindowBorderStyle::MONO);
VclPtrInstance<OApplicationSwapWindow> pSwap( m_pPanel, *this );
pSwap->Show();
- pSwap->SetUniqueId(UID_APP_SWAP_VIEW);
m_pPanel->setChildWindow(pSwap);
- m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW);
m_pPanel->Show();
m_pDetailView = VclPtr<OApplicationDetailView>::Create(*this,_ePreviewMode);
@@ -196,7 +194,6 @@ OApplicationView::OApplicationView( vcl::Window* pParent
}
m_pWin = VclPtr<OAppBorderWindow>::Create(this,_ePreviewMode);
- m_pWin->SetUniqueId(UID_APP_VIEW_BORDER_WIN);
m_pWin->Show();
ImplInitSettings();
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 19a3468..d3a8051 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -376,9 +376,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
m_pTreeView->setSelChangeHdl( LINK( this, SbaTableQueryBrowser, OnSelectionChange ) );
// TODO
- getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(UID_DATABROWSE_DATAWINDOW);
getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER);
- getBrowserView()->SetUniqueId(UID_CTL_CONTENT);
if (getBrowserView()->getVclControl()->GetHeaderBar())
getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(HID_DATABROWSE_HEADER);
InvalidateFeature(ID_BROWSER_EXPLORER);
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index f494471..012d73e 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -87,7 +87,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
- m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
// no local resources needed anymore
const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _pItems->GetItem(DSID_TYPECOLLECTION) );
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 37e89b5..d24a01e 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -172,7 +172,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
- m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
SetRoadmapInteractive( true );
ActivatePage();
setTitleBase(ModuleRes(STR_DBWIZARDTITLE));
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 3182823..77e395f 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -75,9 +75,6 @@ namespace dbaui
, m_nMaxColumnsInIndex(0)
, m_bAddIndexAppendix(false)
{
-
- SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK );
- GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN );
}
VCL_BUILDER_DECL_FACTORY(DbaIndexFieldsControl)
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 1afef0ee..5408b2f 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -621,7 +621,6 @@ void OSQLMessageBox::impl_addDetailsButton()
PushButton* pButton = GetPushButton( RET_MORE );
OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" );
pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) );
- pButton->SetUniqueId( UID_SQLERROR_BUTTONMORE );
}
}
diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index e80bb21..5b30a26 100644
--- a/extensions/inc/bibliography.hrc
+++ b/extensions/inc/bibliography.hrc
@@ -52,7 +52,6 @@
#define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS"
#define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS"
#define HID_BIB_CONTROL_PARENT "EXTENSIONS_HID_BIB_CONTROL_PARENT"
-#define UID_BIB_FRAME_WINDOW "EXTENSIONS_UID_BIB_FRAME_WINDOW"
#define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
#endif // EXTENSIONS_BIBLIOGRAPHY_HRC
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index fb35783..2aaf8bc 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -92,7 +92,7 @@ namespace abp
m_pNextPage->SetHelpId(HID_ABSPILOT_NEXT);
m_pCancel->SetHelpId(HID_ABSPILOT_CANCEL);
m_pFinish->SetHelpId(HID_ABSPILOT_FINISH);
- m_pHelp->SetUniqueId(UID_ABSPILOT_HELP);
+ m_pHelp->SetHelpId(UID_ABSPILOT_HELP);
m_pCancel->SetClickHdl( LINK( this, OAddressBookSourcePilot, OnCancelClicked) );
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index ad713bd..7e448f8 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -174,8 +174,6 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi
,pDatMan( pDataManager )
,pBibMod(nullptr)
{
- vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow );
- pParent->SetUniqueId(UID_BIB_FRAME_WINDOW);
bDisposing=false;
bHierarchical=true;
pImp = new BibFrameCtrl_Impl;
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 016e076..f456999 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -84,8 +84,7 @@ namespace pcr
}
}
-
- void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId )
+ void OBrowserLine::SetComponentHelpIds(const OString& _rHelpId)
{
if ( m_pControlWindow )
m_pControlWindow->SetHelpId( _rHelpId );
@@ -93,17 +92,14 @@ namespace pcr
if ( m_pBrowseButton )
{
m_pBrowseButton->SetHelpId( _rHelpId );
- m_pBrowseButton->SetUniqueId( _sPrimaryButtonId );
if ( m_pAdditionalBrowseButton )
{
m_pAdditionalBrowseButton->SetHelpId( _rHelpId );
- m_pAdditionalBrowseButton->SetUniqueId( _sSecondaryButtonId );
}
}
}
-
void OBrowserLine::setControl( const Reference< XPropertyControl >& _rxControl )
{
m_xControl = _rxControl;
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 33fd5c4..7b61eca7 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -82,7 +82,7 @@ namespace pcr
const OUString& GetEntryName() const { return m_sEntryName; }
- void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId );
+ void SetComponentHelpIds(const OString& _rHelpId);
void SetTitle(const OUString& rString );
void FullFillTitleString();
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 5389c00..5012c49 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1165,9 +1165,7 @@ namespace pcr
m_aOutOfDateLines.insert( nPos );
rLine.pLine->SetComponentHelpIds(
- HelpIdUrl::getHelpId( _rPropertyData.HelpURL ),
- OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ),
- OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 )
+ HelpIdUrl::getHelpId( _rPropertyData.HelpURL )
);
if ( _rPropertyData.bReadOnly )
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 3a83e97..cedd2f3 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -191,11 +191,9 @@ public:
OUString aTxtOk; // behind aBtnEnd
FormulaHelper m_aFormulaHelper;
- OString m_aEditHelpId;
+ OString m_aEditHelpId;
- OString aOldHelp;
- OString aOldUnique;
- OString aActivWinId;
+ OString aOldHelp;
bool bIsShutDown;
bool bMakingTree; //in method of constructing tree
@@ -301,7 +299,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pMEdit->SetAccessibleName(m_pFtFormula->GetText());
m_aEditHelpId = pMEdit->GetHelpId();
- pMEdit->SetUniqueId( m_aEditHelpId );
bEditFlag=false;
bStructUpdate=true;
@@ -316,7 +313,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pTabCtrl->SetTabPage( TP_STRUCT, pStructPage);
aOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1"
- aOldUnique = pParent->GetUniqueId();
m_pFtResult->Show( _bSupportResult );
m_pWndResult->Show( _bSupportResult );
@@ -391,38 +387,22 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
{
- MouseNotifyEvent nSwitch=rNEvt.GetType();
- if(nSwitch==MouseNotifyEvent::GETFOCUS && !bIsShutDown)
- {
- vcl::Window* pWin=rNEvt.GetWindow();
- if(pWin!=nullptr)
- {
- aActivWinId = pWin->GetUniqueId();
- if(aActivWinId.isEmpty())
- {
- vcl::Window* pParent=pWin->GetParent();
- while(pParent!=nullptr)
- {
- aActivWinId=pParent->GetUniqueId();
-
- if(!aActivWinId.isEmpty()) break;
-
- pParent=pParent->GetParent();
- }
- }
- if(!aActivWinId.isEmpty())
- {
-
- FormEditData* pData = m_pHelper->getFormEditData();
-
- if (pData && !aIdle.IsActive()) // won't be destroyed via Close
- {
- pData->SetUniqueId(aActivWinId);
- }
- }
- }
- }
+ if (bIsShutDown)
+ return;
+ MouseNotifyEvent nSwitch = rNEvt.GetType();
+ if (nSwitch != MouseNotifyEvent::GETFOCUS)
+ return;
+ vcl::Window* pWin = rNEvt.GetWindow();
+ if (!pWin)
+ return;
+ if (aIdle.IsActive()) // will be destroyed via Close
+ return;
+ FormEditData* pData = m_pHelper->getFormEditData();
+ if (!pData)
+ return;
+ pData->SetFocusWindow(pWin);
}
+
uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeMapper() const
{
if ( !m_xOpCodeMapper.is() )
@@ -858,7 +838,6 @@ void FormulaDlg_Impl::FillListboxes()
// HelpId for 1. page is the one from the resource
m_pParent->SetHelpId( aOldHelp );
- m_pParent->SetUniqueId( aOldUnique );
}
void FormulaDlg_Impl::FillControls(bool &rbNext, bool &rbPrev)
@@ -1489,7 +1468,6 @@ void FormulaDlg_Impl::UpdateSelection()
m_pEdRef->SetRefString( pTheRefEdit->GetText() );
m_pEdRef->SetSelection( pTheRefEdit->GetSelection() );
m_pEdRef->SetHelpId( pTheRefEdit->GetHelpId() );
- m_pEdRef->SetUniqueId( pTheRefEdit->GetUniqueId() );
}
m_pRefBtn->Show( pButton != nullptr );
@@ -1753,29 +1731,12 @@ void FormulaModalDialog::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton
{
m_pImpl->RefInputStartAfter( pEdit, pButton );
}
+
void FormulaModalDialog::RefInputDoneAfter()
{
m_pImpl->RefInputDoneAfter( true/*bForced*/ );
}
-void FormulaModalDialog::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId)
-{
- if(pWin->GetUniqueId()==nUniqueId)
- {
- pWin->GrabFocus();
- }
- else
- {
- sal_uInt16 nCount=pWin->GetChildCount();
-
- for(sal_uInt16 i=0;i<nCount;i++)
- {
- vcl::Window* pChild=pWin->GetChild(i);
- SetFocusWin(pChild,nUniqueId);
- }
- }
-}
-
bool FormulaModalDialog::PreNotify( NotifyEvent& rNEvt )
{
if (m_pImpl)
@@ -1801,8 +1762,6 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
, true/*_bSupportMatrix*/
, this, _pFunctionMgr, _pDlg))
{
- //undo SfxModelessDialog HelpId clear hack
- reverseUniqueHelpIdHack(*this);
SetText(m_pImpl->aTitle1);
}
@@ -1852,38 +1811,22 @@ void FormulaDlg::DoEnter()
{
m_pImpl->DoEnter(false);
}
+
::std::pair<RefButton*,RefEdit*> FormulaDlg::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton )
{
return m_pImpl->RefInputStartBefore( pEdit, pButton );
}
+
void FormulaDlg::RefInputStartAfter( RefEdit* pEdit, RefButton* pButton )
{
m_pImpl->RefInputStartAfter( pEdit, pButton );
}
+
void FormulaDlg::RefInputDoneAfter( bool bForced )
{
m_pImpl->RefInputDoneAfter( bForced );
}
-void FormulaDlg::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId)
-{
- if(pWin->GetUniqueId()==nUniqueId)
- {
- pWin->GrabFocus();
- }
- else
- {
- sal_uInt16 nCount=pWin->GetChildCount();
-
- for(sal_uInt16 i=0;i<nCount;i++)
- {
- vcl::Window* pChild=pWin->GetChild(i);
- SetFocusWin(pChild,nUniqueId);
- }
- }
-}
-
-
bool FormulaDlg::PreNotify( NotifyEvent& rNEvt )
{
if (m_pImpl)
@@ -1901,7 +1844,6 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
m_pImpl->StoreFormEditData(pData);
}
-
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
{
SAL_WARN_IF( (m_pImpl->pFuncDesc && m_pImpl->pFuncDesc->getSuppressedArgumentCount() != m_pImpl->nArgs),
@@ -1934,19 +1876,18 @@ void FormulaDlg::SetEdSelection()
{
m_pImpl->SetEdSelection();
}
+
IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Idle *, void)
{
FormEditData* pData = m_pImpl->m_pHelper->getFormEditData();
-
- if (pData) // won't be destroyed via Close
- {
- m_pImpl->m_pHelper->setReferenceInput(pData);
- OString nUniqueId(pData->GetUniqueId());
- SetFocusWin(this,nUniqueId);
- }
+ if (!pData)
+ return;
+ // won't be destroyed via Close
+ VclPtr<vcl::Window> xWin(pData->GetFocusWindow());
+ if (xWin && !xWin->IsDisposed())
+ xWin->GrabFocus();
}
-
void FormEditData::SaveValues()
{
FormEditData* pTemp = new FormEditData(*this);
@@ -1965,7 +1906,7 @@ void FormEditData::Reset()
nOffset = 0;
nEdFocus = 0;
bMatrix = false;
- aUniqueId=OString();
+ xFocusWin.clear();
aSelection.Min()=0;
aSelection.Max()=0;
aUndoStr.clear();
@@ -1982,7 +1923,7 @@ FormEditData& FormEditData::operator=( const FormEditData& r )
nEdFocus = r.nEdFocus;
aUndoStr = r.aUndoStr;
bMatrix = r.bMatrix ;
- aUniqueId = r.aUniqueId;
+ xFocusWin = r.xFocusWin;
aSelection = r.aSelection;
return *this;
}
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 77bf516..aa4502a 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -69,7 +69,6 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage
m_pLbFunction->set_height_request(aSize.Height());
m_pLbFunction->set_width_request(aSize.Width());
m_aHelpId = m_pLbFunction->GetHelpId();
- m_pLbFunction->SetUniqueId(m_aHelpId);
InitLRUList();
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 1762796..4b08dd9 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -364,12 +364,6 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
m_pEdArg3->SetHelpId( sHelpId );
m_pEdArg4->SetHelpId( sHelpId );
- // Unique-IDs muessen gleich bleiben fuer Automatisierung
- SetUniqueId( HID_FORMULA_FAP_PAGE );
- m_pEdArg1->SetUniqueId( HID_FORMULA_FAP_EDIT1 );
- m_pEdArg2->SetUniqueId( HID_FORMULA_FAP_EDIT2 );
- m_pEdArg3->SetUniqueId( HID_FORMULA_FAP_EDIT3 );
- m_pEdArg4->SetUniqueId( HID_FORMULA_FAP_EDIT4 );
SetActiveLine(0);
}
else
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
deleted file mode 100644
index 78fd951..0000000
--- a/framework/inc/helpid.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_FRAMEWORK_HELPID_HRC
-#define INCLUDED_FRAMEWORK_HELPID_HRC
-
-#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW"
-#define HID_STATUSBAR "FWK_HID_STATUSBAR"
-
-#endif // #ifndef _FRAMEWORK_HELPID_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 52967aa..7412141 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "helpid.hrc"
#include <classes/resource.hrc>
String STR_MENU_ADDONS
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index d11478e..03dfe6d 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -34,7 +34,6 @@
#include <vcl/commandinfoprovider.hxx>
#include <rtl/ustrbuf.hxx>
#include "helper/mischelper.hxx"
-#include "helpid.hrc"
#include <osl/mutex.hxx>
using namespace com::sun::star::uno;
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index d582085..bf843b9 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -23,7 +23,6 @@
#include <uielement/constitemcontainer.hxx>
#include <uielement/rootitemcontainer.hxx>
#include <uielement/statusbar.hxx>
-#include <helpid.hrc>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -114,7 +113,6 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
pStatusBarManager = new StatusBarManager( m_xContext, xFrame, pStatusBar );
static_cast<FrameworkStatusBar*>(pStatusBar)->SetStatusBarManager( pStatusBarManager );
m_xStatusBarManager.set( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY );
- pStatusBar->SetUniqueId( HID_STATUSBAR );
}
}
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 5f4877e..2e16b80 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -23,7 +23,7 @@
#include <formula/formuladllapi.h>
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
-
+#include <vcl/window.hxx>
namespace formula
{
@@ -43,7 +43,7 @@ public:
inline sal_uInt16 GetEdFocus() const { return nEdFocus; }
inline const OUString& GetUndoStr() const { return aUndoStr; }
inline bool GetMatrixFlag()const{ return bMatrix;}
- const OString& GetUniqueId()const { return aUniqueId;}
+ const VclPtr<vcl::Window>& GetFocusWindow()const { return xFocusWin; }
inline const Selection& GetSelection()const { return aSelection;}
inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
@@ -52,7 +52,7 @@ public:
inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; }
inline void SetMatrixFlag(bool bNew) { bMatrix=bNew;}
- inline void SetUniqueId(const OString& nNew) { aUniqueId=nNew;}
+ inline void SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;}
inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
void Reset();
@@ -69,7 +69,7 @@ private:
sal_uInt16 nEdFocus;
OUString aUndoStr;
bool bMatrix;
- OString aUniqueId;
+ VclPtr<vcl::Window> xFocusWin;
Selection aSelection;
};
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 2456cb0..5cf4c95 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -64,7 +64,6 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = nullptr );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = nullptr );
void RefInputDoneAfter();
- void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId);
void SetMeText(const OUString& _sText);
void Update();
@@ -104,7 +103,6 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = nullptr );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = nullptr );
void RefInputDoneAfter( bool bForced = false );
- void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId);
void SetMeText(const OUString& _sText);
FormulaDlgMode SetMeText(const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate);
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 911e2da..55550b7 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -40,16 +40,6 @@ class HelpButton;
class Button;
class FixedLine;
-//There is a hack which hides the HelpId for a Dialog in SfxModelessDialog
-//and SfxDockingWindow, where it is changed into a UniqueId and cleared
-//This reverses the clear of the HelpId
-
-inline void reverseUniqueHelpIdHack(vcl::Window &rWindow)
-{
- if (rWindow.GetHelpId().isEmpty())
- rWindow.SetHelpId(rWindow.GetUniqueId());
-}
-
// class SfxModalDialog --------------------------------------------------
class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 714ea98..b84e6e2 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -48,9 +48,8 @@ namespace o3tl {
#define WINDOW_HELPTEXT 0x0100
#define WINDOW_QUICKTEXT 0x0200
#define WINDOW_EXTRALONG 0x0800
-#define WINDOW_UNIQUEID 0x1000
-#define WINDOW_BORDER_STYLE 0x2000
-#define WINDOW_HELPID 0x4000
+#define WINDOW_BORDER_STYLE 0x1000
+#define WINDOW_HELPID 0x2000
// For "WorkWindow" resources:
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 8997a1a..4b34ae0 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -55,7 +55,6 @@ private:
sal_uInt16 mnCurPageId;
bool mbFormat;
bool mbRestoreHelpId;
- bool mbRestoreUnqId;
bool mbSmallInvalidate;
bool mbLayoutDirty;
Link<TabControl*,void> maActivateHdl;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9f6f7ef..a2f3276 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1179,9 +1179,6 @@ public:
void SetHelpId( const OString& );
const OString& GetHelpId() const;
- void SetUniqueId( const OString& );
- const OString& GetUniqueId() const;
-
vcl::Window* FindWindow( const Point& rPos ) const;
sal_uInt16 GetChildCount() const;
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 7a41d18..8cfa5b9 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -29,14 +29,10 @@
#define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW"
#define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW"
#define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER"
-#define UID_RPT_SECTIONSWINDOW "REPORTDESIGN_UID_RPT_SECTIONSWINDOW"
-#define UID_RPT_VIEWSWINDOW "REPORTDESIGN_UID_RPT_VIEWSWINDOW"
-#define HID_RPT_ENDMARKER "REPORTDESIGN_HID_RPT_ENDMARKER"
#define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER"
#define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION"
#define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR"
#define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR"
-#define HID_RPT_STARTMARKER "REPORTDESIGN_HID_RPT_STARTMARKER"
#define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION"
#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER"
#define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL"
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index 0be8a73..cdf9681e 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -33,9 +33,8 @@ namespace rptui
{
OEndMarker::OEndMarker(vcl::Window* _pParent ,const OUString& _sColorEntry)
-: OColorListener(_pParent,_sColorEntry)
+ : OColorListener(_pParent, _sColorEntry)
{
- SetUniqueId(HID_RPT_ENDMARKER);
ImplInitSettings();
}
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 2c6de37..b4c1ea9 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -53,7 +53,6 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
,m_aSplitter(VclPtr<Splitter>::Create(this))
,m_aEndMarker( VclPtr<rptui::OEndMarker>::Create(this,_sColorEntry))
{
- SetUniqueId(UID_RPT_SECTIONSWINDOW);
const MapMode& rMapMode = _pParent->GetMapMode();
SetMapMode( rMapMode );
ImplInitSettings();
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 0548606..2d794da 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -54,8 +54,6 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
,m_pParent(_pParent)
,m_bShowRuler(true)
{
- SetUniqueId(HID_RPT_STARTMARKER);
-
osl_atomic_increment(&s_nImageRefCount);
initDefaultNodeImages();
ImplInitSettings();
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 3db7fc4..ef331d4 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -167,14 +167,12 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
return bMoveAllowed;
}
-
OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
: Window( _pReportWindow,WB_DIALOGCONTROL)
, m_pParent(_pReportWindow)
, m_bInUnmark(false)
{
SetPaintTransparent(true);
- SetUniqueId(UID_RPT_VIEWSWINDOW);
SetMapMode(MapMode(MAP_100TH_MM));
m_aColorConfig.AddListener(this);
ImplInitSettings();
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 8156779..cf4e9e0 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -280,8 +280,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_QUICKTEXT );
nId = aNmTb.Put( "ExtraLong", VARNAME );
pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_EXTRALONG );
- nId = aNmTb.Put( "UniqueId", VARNAME );
- pClassWindow->SetVariable( nId, &aString, nullptr, 0, WINDOW_UNIQUEID );
// border style
RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index c0e292e..63e6cef 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -765,7 +765,6 @@ ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef
pActiveWin(nullptr)
{
m_aHelper.SetWindow(m_rWindow.get());
- reverseUniqueHelpIdHack(*m_rWindow.get());
aIdle.SetPriority(SchedulerPriority::LOWER);
aIdle.SetIdleHdl(LINK( this, ScRefHandler, UpdateFocusHdl));
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5cc9ba4..f106884 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -518,7 +518,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos
SetDialogControlFlags( DialogControlFlags::Return | DialogControlFlags::WantFocus );
SetHelpId( HID_SC_WIN_GRIDWIN );
- SetUniqueId( HID_SC_WIN_GRIDWIN );
SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
EnableRTL( false );
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index db7d43b..a8dc240 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -131,7 +131,6 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell*
SetBackground();
SetHelpId( HID_SC_WIN_PREVIEW );
- SetUniqueId( HID_SC_WIN_PREVIEW );
SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 8fd0c49..bd08b87 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -163,9 +163,6 @@ AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW,
m_pCtlDisplay->set_vexpand(true);
m_pCtlDisplay->Show();
- //undo SfxDockingWindow HelpId clear hack
- reverseUniqueHelpIdHack(*this);
-
// create new document with page
pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, nullptr);
SdPage* pPage = pMyDoc->AllocSdPage(false);
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index eeb01c6..b1a104f 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -64,7 +64,6 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc
// set HelpId
SetHelpId( HID_SD_WIN_PRESENTATION );
- SetUniqueId( HID_SD_WIN_PRESENTATION );
maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) );
maPauseTimer.SetTimeout( 1000 );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 6c6396d..d8dc8a2 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -482,19 +482,16 @@ void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans
{
SetHelpId( SID_NOTES_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_NOTES_MODE );
- GetActiveWindow()->SetUniqueId( CMD_SID_NOTES_MODE );
}
else if (mePageKind == PK_HANDOUT)
{
SetHelpId( SID_HANDOUT_MASTER_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUT_MASTER_MODE );
- GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUT_MASTER_MODE );
}
else
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
}
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 52cd788..c356a19 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -281,7 +281,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
SetHelpId( SD_IF_SDGRAPHICVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL );
- GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL );
}
else
{
@@ -289,7 +288,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
SetHelpId( SID_NOTES_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_NOTES_MODE );
- GetActiveWindow()->SetUniqueId( CMD_SID_NOTES_MODE );
// AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
@@ -298,7 +296,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
SetHelpId( SID_HANDOUT_MASTER_MODE );
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUT_MASTER_MODE );
- GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUT_MASTER_MODE );
// AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
@@ -307,7 +304,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
SetHelpId( SD_IF_SDDRAWVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL );
- GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL );
}
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 86f7156..c875ce3 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -164,7 +164,6 @@ void OutlineViewShell::Construct(DrawDocShell* )
SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
- GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL );
}
Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController()
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index c1e2594..97c4a5d 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -84,10 +84,6 @@ Window::Window(vcl::Window* pParent)
? sd::OUTPUT_DRAWMODE_CONTRAST
: sd::OUTPUT_DRAWMODE_COLOR );
- // set Help ID
- // SetHelpId(HID_SD_WIN_DOCUMENT);
- SetUniqueId(HID_SD_WIN_DOCUMENT);
-
// #i78183# Added after discussed with AF
EnableRTL(false);
}
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index adea3458..594db9f 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -318,7 +318,6 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
pImpl.reset(new SfxModelessDialog_Impl);
pImpl->pMgr = pCW;
pImpl->bConstructed = false;
- SetUniqueId( GetHelpId() );
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
@@ -455,8 +454,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
{
pImpl->pMgr = pCW;
pImpl->bConstructed = false;
- SetUniqueId( GetHelpId() );
- SetHelpId("");
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
@@ -474,10 +471,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
pImpl->pMgr = pCW;
pImpl->bConstructed = false;
- //do we really need this odd helpid/uniqueid dance ?
- SetUniqueId( GetHelpId() );
- SetHelpId("");
-
if ( pBindinx )
pImpl->StartListening( *pBindinx );
pImpl->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
@@ -756,9 +749,6 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
OString sHelpId(pImpl->m_pSfxPage->GetHelpId());
if (!sHelpId.isEmpty())
SetHelpId(sHelpId);
- OString sUniqueId(pImpl->m_pSfxPage->GetUniqueId());
- if (!sUniqueId.isEmpty())
- SetUniqueId(sUniqueId);
}
}
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 9e3821e..25c72d8 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -826,24 +826,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
pBindings(pBindinx),
pMgr(pCW)
{
- if ( !GetHelpId().isEmpty() )
- {
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- }
- else
- {
- SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
- SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
- const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : nullptr;
- if ( pSlot )
- {
- OString aCmd("SFXDOCKINGWINDOW_");
- aCmd += pSlot->GetUnoName();
- SetUniqueId( aCmd );
- }
- }
-
pImpl.reset( new SfxDockingWindow_Impl );
pImpl->bConstructed = false;
pImpl->pSplitWin = nullptr;
@@ -871,24 +853,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
, pBindings(pBindinx)
, pMgr(pCW)
{
- if ( !GetHelpId().isEmpty() )
- {
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- }
- else
- {
- SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
- SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
- const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : nullptr;
- if ( pSlot )
- {
- OString aCmd("SFXDOCKINGWINDOW_");
- aCmd += pSlot->GetUnoName();
- SetUniqueId( aCmd );
- }
- }
-
pImpl.reset( new SfxDockingWindow_Impl );
pImpl->bConstructed = false;
pImpl->pSplitWin = nullptr;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1b7fe46..eba45ac 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -109,7 +109,6 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell)
SetTotalSize();
SetHelpId(HID_SMA_WIN_DOCUMENT);
- SetUniqueId(HID_SMA_WIN_DOCUMENT);
ShowLine(false);
CaretBlinkInit();
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 309af06..1d4155e 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -34,8 +34,6 @@
#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE"
#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS"
#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS"
-#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME"
-#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW"
#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD"
#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT"
#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE"
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 6e17d45..69b8837 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -35,7 +35,6 @@
#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE"
#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START"
#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE"
-#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX"
#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX"
#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW"
#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW"
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 64665c8..498bfb3 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -194,7 +194,6 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings*
::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y);
SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y));
SetOutputSizePixel(aPropWinSize);
- SetUniqueId(UID_FORMPROPBROWSER_FRAME);
try
{
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 117155a..467834b 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -136,12 +136,9 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
SfxToolBoxControl::StateChanged( nSID, eState,pState );
}
-
VclPtr<vcl::Window> SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent )
{
- VclPtrInstance<SvxFmAbsRecWin> pWin( pParent, this );
- pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW );
- return pWin.get();
+ return VclPtrInstance<SvxFmAbsRecWin>(pParent, this);
}
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
@@ -151,12 +148,10 @@ SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, Tool
{
}
-
SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
{
}
-
VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
{
OUString aText(SVX_RESSTR(RID_STR_REC_TEXT));
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 3fe70b5..a1e1f95 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -548,10 +548,6 @@ VclPtr<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent
mpFillControl->Resize();
mpToolBoxColor->InsertItem(".uno:FillColor", m_xFrame, ToolBoxItemBits::DROPDOWNONLY, Size(mpToolBoxColor->GetSizePixel().Width(), 0));
- mpLbFillAttr->SetUniqueId(HID_FILL_ATTR_LISTBOX);
- mpToolBoxColor->SetUniqueId(HID_FILL_ATTR_LISTBOX);
- mpLbFillType->SetUniqueId(HID_FILL_TYPE_LISTBOX);
-
mpLbFillType->SetSelectHdl(LINK(this,SvxFillToolBoxControl,SelectFillTypeHdl));
mpLbFillAttr->SetSelectHdl(LINK(this,SvxFillToolBoxControl,SelectFillAttrHdl));
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index cfd214d..0ff197a 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -233,7 +233,6 @@ public:
long mnAbsScreenX;
Point maPos;
OString maHelpId;
- OString maUniqId;
OUString maHelpText;
OUString maQuickHelpText;
InputContext maInputContext;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 37a9a07..14a53ec 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -94,7 +94,6 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnCurPageId = 0;
mbFormat = true;
mbRestoreHelpId = false;
- mbRestoreUnqId = false;
mbSmallInvalidate = false;
mpTabCtrlData = new ImplTabCtrlData;
mpTabCtrlData->mpListBox = nullptr;
@@ -625,8 +624,6 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
{
if ( mbRestoreHelpId )
pCtrlParent->SetHelpId( OString() );
- if ( mbRestoreUnqId )
- pCtrlParent->SetUniqueId( OString() );
pOldPage->DeactivatePage();
}
@@ -647,11 +644,6 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
mbRestoreHelpId = true;
pCtrlParent->SetHelpId( pPage->GetHelpId() );
}
- if ( pCtrlParent->GetUniqueId().isEmpty() )
- {
- mbRestoreUnqId = true;
- pCtrlParent->SetUniqueId( pPage->GetUniqueId() );
- }
pPage->ActivatePage();
pPage->Show();
diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx
index 332d163..fba41a6 100644
--- a/vcl/source/window/resource.cxx
+++ b/vcl/source/window/resource.cxx
@@ -146,8 +146,6 @@ void Window::ImplLoadRes( const ResId& rResId )
sal_uIntPtr nRes = ReadLongRes();
SetData( reinterpret_cast<void*>(nRes) );
}
- if ( nObjMask & WINDOW_UNIQUEID )
- SetUniqueId( ReadByteStringRes() );
if ( nObjMask & WINDOW_BORDER_STYLE )
{
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2b9b5e6e..95a6e1d 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -909,16 +909,6 @@ const OString& Window::GetHelpId() const
return mpWindowImpl->maHelpId;
}
-void Window::SetUniqueId( const OString& rUniqueId )
-{
- mpWindowImpl->maUniqId = rUniqueId;
-}
-
-const OString& Window::GetUniqueId() const
-{
- return mpWindowImpl->maUniqId;
-}
-
// --------- old inline methods ---------------
vcl::Window* Window::ImplGetWindow()
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index f4a24b2..f79296f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -138,8 +138,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
pSignatures->set_height_request(aControlSize.Height());
m_pSignaturesLB = VclPtr<SvSimpleTable>::Create(*pSignatures);
- // #i48253# the tablistbox needs its own unique id
- m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
// Give the first column 6 percent, try to distribute the rest equally.
static long aTabs[] = { 5, 0, 6*nControlWidth/100, 30*nControlWidth/100, 54*nControlWidth/100, 78*nControlWidth/100 };
m_pSignaturesLB->SetTabs(aTabs);
More information about the Libreoffice-commits
mailing list