diff options
| author | Carsten Driesner <cd@openoffice.org> | 2001-08-03 17:21:14 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2001-08-03 17:21:14 +0000 |
| commit | ff318fb17971e530715d13dab07bd602c5bf35c6 (patch) | |
| tree | 97c8108226dea9f305ad850f4f4eff6404282ccc /sfx2/source/menu/mnumgr.cxx | |
| parent | 1cbeed3bc1612e018faad263ae2e3aa14c579e05 (diff) | |
#87722# support new xml configuration for toolboxes,menus,statusbars,accelerators
Diffstat (limited to 'sfx2/source/menu/mnumgr.cxx')
| -rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 9e38289ca7..5eefaf63c3 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mnumgr.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: pb $ $Date: 2001-07-10 08:46:20 $ + * last change: $Author: cd $ $Date: 2001-08-03 18:21:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -459,7 +459,10 @@ int SfxMenuManager::Load( SvStream& rStream ) { Menu* pSVMenu = LoadMenu( rStream ); if ( pSVMenu ) + { Construct_Impl( pSVMenu, FALSE ); + SetDefault( FALSE ); + } else UseDefault(); } @@ -1491,11 +1494,14 @@ int SfxMenuBarManager::Load( SotStorage& rStorage ) { Menu *pSVMenu = LoadMenuBar( *xStream ); if ( pSVMenu ) + { Construct_Impl( pSVMenu, FALSE ); - if ( pSVMenu != NULL ) + SetDefault( FALSE ); return ERR_OK; + } else - return ERR_READ; + UseDefault(); + return ERR_READ; } } |