summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-07-28 10:14:00 +0200
committerJan Holesovsky <kendy@suse.cz>2011-07-28 10:14:00 +0200
commitddf76ab15f4291c4c69026b820e812f4b2f3dfe1 (patch)
treed184acbf844f075ed1e17c09b1b539ac1473f6b6
parent17ad15b70a1c1362952655e4610e4c8e35a6a1bd (diff)
parent0f9cfad26dd3086f7ac11347e6b62f4e07678534 (diff)
Merge commit 'libreoffice-3.4.2.3'
-rw-r--r--dbaccess/source/ui/app/AppController.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 01a4a0d34..9f225d0ce 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1937,7 +1937,8 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
{
ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
- getContainer()->selectContainer(eType);
+ if (getContainer())
+ getContainer()->selectContainer(eType);
return 0L;
}
// -----------------------------------------------------------------------------