(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

4 files changed, 0 insertions, 21 deletions

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index cfd214d8098f..0ff197a9092c 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 37a9a070784d..14a53ec42f66 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 332d163d97a4..fba41a6c7e34 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 2b9b5e6e7dc6..95a6e1de8794 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()