summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-08-11 16:22:24 +0000
committerOliver Bolte <obo@openoffice.org>2004-08-11 16:22:24 +0000
commit0ffabd6da8ae6bdd9205b8ebc850e9d2fbf09138 (patch)
treea052641169d86c078ec8cfb093019f77db312aab /framework
parent1b2196408ac7c7a2b141252e1fcf97836144ed2d (diff)
INTEGRATION: CWS docking3 (1.7.26); FILE MERGED
2004/07/22 15:12:10 cd 1.7.26.1: #i31942# Check VCL window pointer before use
Diffstat (limited to 'framework')
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e9a5fab5b2b6..00c47dd98646 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: layoutmanager.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2004-08-02 15:12:17 $
+ * last change: $Author: obo $ $Date: 2004-08-11 17:22:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1477,7 +1477,10 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const ::
// Retrieve output size from container Window
vos::OGuard aGuard( Application::GetSolarMutex() );
pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
- return pContainerWindow->GetOutputSizePixel();
+ if ( pContainerWindow )
+ return pContainerWindow->GetOutputSizePixel();
+ else
+ return ::Size();
}
void LayoutManager::implts_sortUIElements()