summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-05-28 15:13:59 +0000
committerOliver Bolte <obo@openoffice.org>2004-05-28 15:13:59 +0000
commitb70a1fca4bbaed3a683f5ff1d4a155f1157435e5 (patch)
tree2f7033070a01871a4c6cc6bdba6e895605cacd4d /basctl
parent70790b0c2f722af43f077e5e7bfd4f217b39dac4 (diff)
INTEGRATION: CWS tbe8 (1.43.54); FILE MERGED
2004/04/28 14:25:31 tbe 1.43.54.1: #115661# Crash in BASIC Organizer (encrypted library)
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/moduldl2.cxx16
1 files changed, 10 insertions, 6 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index d8d68e539da9..d9308fdb300e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: moduldl2.cxx,v $
*
- * $Revision: 1.44 $
+ * $Revision: 1.45 $
*
- * last change: $Author: rt $ $Date: 2004-05-19 08:02:20 $
+ * last change: $Author: obo $ $Date: 2004-05-28 16:13:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -747,9 +747,11 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && !xModLibContainer->isLibraryLoaded( aOULibName ) )
{
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
- pIDEShell->GetViewFrame()->GetWindow().EnterWait();
+ if ( pIDEShell )
+ pIDEShell->GetViewFrame()->GetWindow().EnterWait();
xModLibContainer->loadLibrary( aOULibName );
- pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
+ if ( pIDEShell )
+ pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
}
// load dialog library (if not loaded)
@@ -757,9 +759,11 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && !xDlgLibContainer->isLibraryLoaded( aOULibName ) )
{
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
- pIDEShell->GetViewFrame()->GetWindow().EnterWait();
+ if ( pIDEShell )
+ pIDEShell->GetViewFrame()->GetWindow().EnterWait();
xDlgLibContainer->loadLibrary( aOULibName );
- pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
+ if ( pIDEShell )
+ pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
}
// check, if library is password protected