summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-10-28 12:27:19 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-10-28 12:27:19 +0000
commitd1d7f01b9517024f5993d0850f8f412129bc34ee (patch)
tree9172e37935b1edeae7527a74d7864aaec61a3ed0
parent8636a60caa15832da8631a97be885595abc397ec (diff)
CWS-TOOLING: integrate CWS fwk126
2009-10-16 17:28:14 +0200 cd r276992 : #i105947# Add missing readConfigurationData() call. 2009-10-16 17:24:43 +0200 cd r276991 : #i105947# Check window pointer before calling SetStyle()
-rw-r--r--framework/source/uifactory/windowcontentfactorymanager.cxx7
-rw-r--r--sfx2/source/dialog/dockwin.cxx3
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);
}