diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-10-30 14:54:21 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-10-30 14:54:21 +0100 |
| commit | e250be94fcee1117198e088b85747da7dee6472a (patch) | |
| tree | eea48b7c569af9e9c1a8b6327033fa6f44030acd | |
| parent | c3f30d270d2aa5e686ed26da886afcb4df444b78 (diff) | |
| parent | fd1be11b2f7031ebd5f2cd1339132f56a9f0e60d (diff) | |
CWS-TOOLING: integrate CWS fwk126_DEV300
| -rw-r--r-- | framework/source/uifactory/windowcontentfactorymanager.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fcadc1694e54..239c6aff5c1f 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 ) { diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index f31ed1724907..cf7d04ef0875 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); } |