Skip to content

C
core
Kaydet (Commit) 49236240 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

allow NULL SfxChildWindow 

Change-Id: I841b9b3f74a9822fe8c477a280bbe2f4904ed64c
üst 2b34b48a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sfx2/source/dialog/dockwin.cxx
Dosyayı görüntüle @ 49236240
...@@ -866,7 +866,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, ...@@ -866,7 +866,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
{ {
SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL;
if ( pSlot ) if ( pSlot )
{ {
OString aCmd("SFXDOCKINGWINDOW_"); OString aCmd("SFXDOCKINGWINDOW_");
...@@ -917,7 +917,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, ...@@ -917,7 +917,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
{ {
SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL;
if ( pSlot ) if ( pSlot )
{ {
OString aCmd("SFXDOCKINGWINDOW_"); OString aCmd("SFXDOCKINGWINDOW_");
...@@ -965,7 +965,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, ...@@ -965,7 +965,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
{ {
SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); const SfxSlot* pSlot = pCW ? pSlotPool->GetSlot( pCW->GetType() ) : NULL;
if ( pSlot ) if ( pSlot )
{ {
OString aCmd("SFXDOCKINGWINDOW_"); OString aCmd("SFXDOCKINGWINDOW_");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment