diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:33:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-24 12:33:35 +0000 |
| commit | 165230437837f84673d5f90be93d623a2d3a0f0c (patch) | |
| tree | 8bddcb234cda0c60ae5444bba03b7e63234efa0d | |
| parent | a2505ec16d9118e40ced54e20402212d34cd1b1f (diff) | |
INTEGRATION: CWS mav4 (1.9.2); FILE MERGED
2003/04/15 09:14:01 as 1.9.2.1: #108892# fix some potentiell bugs, which can occures on office startup
| -rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index e3201ce93abe..5ea4642963af 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menudispatcher.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2003-04-04 17:16:19 $ + * last change: $Author: rt $ $Date: 2003-04-24 13:33:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -276,11 +276,17 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& a pResManager = new ResMgr( aResourceFileName ); } + if (!pResManager) + { + LOG_WARNING("MenuDispatcher::dispatch()", "no res manager!") + return; + } + nResId = aResourceString.copy( nResIdIndex+1 ).toInt32(); ResId aMenuBarResId( nResId, pResManager ); aMenuBarResId.SetRT( RSC_MENU ); - if ( Resource::GetResManager()->IsAvailable(aMenuBarResId ) ) + if ( pResManager->IsAvailable(aMenuBarResId ) ) { pMenuBar = new MenuBar( aMenuBarResId ); pMenuBar->SetCloserHdl( LINK( this, MenuDispatcher, Close_Impl ) ); |