Integrate branch of IAccessible2

Change-Id: Ibf3be46e8619c2dce9636e8a90a6703f3e28ba33

1 files changed, 11 insertions, 0 deletions

diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index b71cad6ab113..537711410b6f 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -811,6 +811,10 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
                     }
                 }
             }
+            //Fire the acc focus event when focus is switched back. The above method mpCurrentViewShellBase->GetWindow()->GrabFocus() will
+            //set focus to WorkWindow instead of the sd::window, so here call Shell's method to fire the focus event
+            if (pViewShell)
+                pViewShell->SwitchActiveViewFireFocus();
         }
         mpCurrentViewShellBase = 0;
     }
@@ -1038,6 +1042,8 @@ void SlideShow::activate( ViewShellBase& rBase )
             if( mxController->startShow(mxCurrentSettings.get()) )
             {
                 pShell->Resize();
+                // Defer the sd::ShowWindow's GrabFocus to here. so that the accessible event can be fired correctly.
+                pShell->GetActiveWindow()->GrabFocus();
             }
             else
             {
@@ -1213,6 +1219,11 @@ void SlideShow::StartInPlacePresentation()
 
         if( !bSuccess )
             end();
+        else
+        {
+            if(mpCurrentViewShellBase)
+                mpCurrentViewShellBase->GetWindow()->GrabFocus();
+        }
     }
 }