1. mst
  2. ooo340

Commits

Vladimir Glazunov  committed 2288e85 Merge

CWS-TOOLING: integrate CWS fwk126_DEV300

  • Participants
  • Parent commits 2e2ef9c, 0db85e3
  • Branches default

Comments (0)

Files changed (2)

File framework/source/uifactory/windowcontentfactorymanager.cxx

View file
         // 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 )
         {

File sfx2/source/dialog/dockwin.cxx

View file
         }
 		
         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);
     }