From 50889324d362a52a6b9239f08127152321416f9e Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 16 Oct 2009 15:24:43 +0000 Subject: #i105947# Check window pointer before calling SetStyle() --- sfx2/source/dialog/dockwin.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index b10283c849..89aaf2a240 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -236,7 +236,8 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , } Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); - pContentWindow->SetStyle( pContentWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); + if ( pContentWindow ) + pContentWindow->SetStyle( pContentWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); pTitleDockWindow->SetWrappedWindow(pContentWindow); } -- cgit v1.2.3 From 6f8622d7dfeeab697077b94828d20f6b485fa62a Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 16 Oct 2009 15:28:14 +0000 Subject: #i105947# Add missing readConfigurationData() call. --- framework/source/uifactory/windowcontentfactorymanager.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index b860deb8f3..7ac9f08901 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -220,6 +220,13 @@ throw (uno::Exception, uno::RuntimeException) // module identifier, user interface element type and name // SAFE ResetableGuard aLock( m_aLock ); + + if ( !m_bConfigRead ) + { + m_bConfigRead = sal_True; + m_pConfigAccess->readConfigurationData(); + } + aImplementationName = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); if ( aImplementationName.getLength() > 0 ) { -- cgit v1.2.3