diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 13:42:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:24:20 +0100 |
commit | 07f1a395098a7a3ac75eb5f05c35aa3982e33e67 (patch) | |
tree | de5521de6b2bc6c9a09ddfab61942a8e27214ebb /dbaccess/source/ui/app | |
parent | d9ac7def8ba320853e8865535a7a14f9af77521e (diff) |
(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
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 3 |
4 files changed, 0 insertions, 12 deletions
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(); |