(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

10 files changed, 0 insertions, 39 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index d005d98eaaed..3280fe412a47 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 01fe86d961e5..d1ed43cd2fa9 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 d850c9d92869..836059f28935 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 6d737855ec25..6a481b3b56a0 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 8365235a8736..cb07e831cda7 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 19a3468dd9c6..d3a80511b860 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 f494471ece74..012d73e3ac47 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 37e89b59a29b..d24a01e82c08 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 31828232ce46..77e395f025bd 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 1afef0ee0a9b..5408b2f12220 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 );
     }
 }