From 9c7a536edbb3242cb82084b5525dfa8e26eca3f6 Mon Sep 17 00:00:00 2001
From: Steve Yin <steve_y@apache.org>
Date: Tue, 26 Nov 2013 15:38:11 +0000
Subject: Integrate branch of IAccessible2

Change-Id: I7d6764cfc86b7b8846c0908278ae10a68c0a14f5
---
 sfx2/source/dialog/tabdlg.cxx   | 3 +++
 sfx2/source/dialog/templdlg.src | 3 ++-
 sfx2/source/menu/mnuitem.cxx    | 4 ++++
 sfx2/source/view/viewfrm.cxx    | 8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 065a23c8e3d4..afdf8724bd91 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -698,6 +698,9 @@ void SfxTabDialog::Start( sal_Bool bShow )
 
     if ( bShow )
         Show();
+
+    if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) )
+        GrabFocusToFirstControl();
 }
 
 // -----------------------------------------------------------------------
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 65ee1cfd6f0c..fd9c11d2b1e6 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -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" ;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 45b790134141..57c972fbe0ed 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -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) )
     {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f29363bbad24..c95686919f3a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -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 )
-- 
cgit