(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

6 files changed, 4 insertions, 13 deletions

diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index e80bb21470a8..5b30a2605c51 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 fb357839a390..2aaf8bce1e81 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 ad713bd538cb..7e448f8ff887 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 016e0769078e..f456999ad76f 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 33fd5c485d6a..7b61eca74a6f 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 5389c006bfb6..5012c4938771 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 )