diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-17 14:27:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-17 14:27:25 +0000 |
| commit | 4923624069d932b33f13017b4e288ad44eef8dbf (patch) | |
| tree | 0b921e7d4479f2aa8afcd03074e6a8dec5252c63 /sfx2 | |
| parent | 2b34b48aacc10cbe256064f7606a114e232f3695 (diff) | |
allow NULL SfxChildWindow
Change-Id: I841b9b3f74a9822fe8c477a280bbe2f4904ed64c
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 24e2160344ec..2f47a5f2d7e5 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -866,7 +866,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, { SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); - const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL; if ( pSlot ) { OString aCmd("SFXDOCKINGWINDOW_"); @@ -917,7 +917,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, { SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); - const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL; if ( pSlot ) { OString aCmd("SFXDOCKINGWINDOW_"); @@ -965,7 +965,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, { SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); - const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL; if ( pSlot ) { OString aCmd("SFXDOCKINGWINDOW_"); |