CWS-TOOLING: integrate CWS fwk155
This commit is contained in:
commit
109c2197d5
1 changed files with 18 additions and 11 deletions
|
@ -1179,6 +1179,10 @@ bool MenuSaveInData::LoadSubMenus(
|
|||
{
|
||||
SvxEntries* pEntries = pParentData->GetEntries();
|
||||
|
||||
// Don't access non existing menu configuration!
|
||||
if ( !xMenuSettings.is() )
|
||||
return true;
|
||||
|
||||
for ( sal_Int32 nIndex = 0; nIndex < xMenuSettings->getCount(); nIndex++ )
|
||||
{
|
||||
uno::Reference< container::XIndexAccess > xSubMenu;
|
||||
|
@ -2594,6 +2598,8 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
|
|||
SvxConfigEntry* pMenuData = GetTopLevelSelection();
|
||||
|
||||
PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu();
|
||||
if ( pMenuData )
|
||||
{
|
||||
pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
|
||||
pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
|
||||
pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
|
||||
|
@ -2606,6 +2612,7 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
|
|||
SvxConfigEntry* pEntry = *iter;
|
||||
InsertEntryIntoUI( pEntry );
|
||||
}
|
||||
}
|
||||
|
||||
UpdateButtonStates();
|
||||
|
||||
|
|
Loading…
Reference in a new issue