summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-25 13:42:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-25 14:24:20 +0100
commit07f1a395098a7a3ac75eb5f05c35aa3982e33e67 (patch)
treede5521de6b2bc6c9a09ddfab61942a8e27214ebb /sfx2
parentd9ac7def8ba320853e8865535a7a14f9af77521e (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 'sfx2')
-rw-r--r--sfx2/source/dialog/basedlgs.cxx10
-rw-r--r--sfx2/source/dialog/dockwin.cxx36
2 files changed, 0 insertions, 46 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index adea3458a501..594db9ff87dd 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 9e3821e498ad..25c72d8a6276 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;