summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-02-28 16:55:36 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2011-02-28 16:55:36 +0100
commit195eec7512bd8ef30b0232fb474a8998f5dab197 (patch)
tree67311c4ccad62f2afefee239a7c31eaf22efb1d2 /desktop
parent4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (diff)
parent7d62959d73c2dcc2b453b27f7545d5d1eb402025 (diff)
CWS-TOOLING: integrate CWS sw34bf03
Diffstat (limited to 'desktop')
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 8bd8a6191201..a8a1025959f1 100755..100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -165,7 +165,7 @@ public:
m_bWarnUser( false )
{}
- Dialog * activeDialog() { return m_pDialogHelper->getWindow(); }
+ Dialog * activeDialog() { return m_pDialogHelper ? m_pDialogHelper->getWindow() : NULL; }
void setTitle( const OUString& rNewTitle ) { m_sTitle = rNewTitle; }
void startProgress();