Kaydet (Commit) 2b951c2e authored tarafından Steve Yin's avatar Steve Yin Kaydeden (comit) Caolán McNamara

Integrate branch of IAccessible2

Change-Id: I7d6764cfc86b7b8846c0908278ae10a68c0a14f5
üst 3507ffab
......@@ -698,6 +698,9 @@ void SfxTabDialog::Start( sal_Bool bShow )
if ( bShow )
Show();
if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) )
GrabFocusToFirstControl();
}
// -----------------------------------------------------------------------
......
......@@ -35,11 +35,12 @@ ImageList DLG_STYLE_DESIGNER
IdCount = { 3 ; };
};
// Strings ---------------------------------------------------------------
// Strings ---------------------------------------------------------------
String STR_STYLE_ELEMTLIST
{
Text [ en-US ] = "Style List" ;
};
String STR_STYLE_FILTER_HIERARCHICAL
{
Text [ en-US ] = "Hierarchical" ;
......
......@@ -198,6 +198,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxBoolItem not allowed for SID_OBJECTMENUx" );
bCheck = ((const SfxBoolItem*)pState)->GetValue();
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
}
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue() )
......@@ -206,6 +208,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxEnumItem not allowed for SID_OBJECTMENUx" );
bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
Menu* pMenu = pOwnMenu->GetSVMenu();
pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE);
}
else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
{
......
......@@ -676,7 +676,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( pSalvageItem )
{
aURL = pSalvageItem->GetValue();
pNewSet->ClearItem( SID_DOC_SALVAGE );
if (pNewSet)
{
pNewSet->ClearItem( SID_ORIGURL );
pNewSet->ClearItem( SID_DOC_SALVAGE );
}
}
#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
......@@ -3134,13 +3138,13 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
sal_Bool bHasChild = HasChildWindow(nSID);
sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
GetDispatcher()->Update_Impl( sal_True );
// Perform action.
if ( !pShowItem || bShow != bHasChild )
ToggleChildWindow( nSID );
GetBindings().Invalidate( nSID );
GetDispatcher()->Update_Impl( sal_True );
// Record if possible.
if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment