strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS fwk155

Browse source
This commit is contained in:
Kurt Zenker 2010-09-03 14:31:58 +02:00
commit 109c2197d5
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cui/source/customize/cfg.cxx
View file

@ -1177,7 +1177,11 @@ bool MenuSaveInData::LoadSubMenus(
const OUString& rBaseTitle,
SvxConfigEntry* pParentData )
{
SvxEntries* pEntries = pParentData->GetEntries();
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++ )
{
@ -2594,17 +2598,20 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu();
pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin();
for ( ; iter != pEntries->end(); iter++ )
if ( pMenuData )
{
SvxConfigEntry* pEntry = *iter;
InsertEntryIntoUI( pEntry );
pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin();
for ( ; iter != pEntries->end(); iter++ )
{
SvxConfigEntry* pEntry = *iter;
InsertEntryIntoUI( pEntry );
}
}
UpdateButtonStates();