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 | 16c496fb595d3adbc659902277ec17a679d6a8c4 (patch) | |
| tree | d2a4ad8d78cebeb98b0e150c9d745fc1ae010e91 | |
| parent | 46178d1dfd0b4a979bee1ab41848356c7e8a3c3b (diff) | |
| parent | 6f8622d7dfeeab697077b94828d20f6b485fa62a (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 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 ) { 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); } |