diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-01 23:25:50 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-10-05 18:51:30 -0500 |
| commit | 69dcd27b9f22c35ae217532d3c5a781a8ac5e403 (patch) | |
| tree | f4b09a4976e79458edc73448506b5d406285b020 | |
| parent | 774b03d50932dd16879ab1f45bc3437f7c05e921 (diff) | |
accfixes2: accname when the doc title changed...
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 57e60136b617..95c844107c56 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -662,7 +662,14 @@ void SfxTabDialog::Start( sal_Bool bShow ) Start_Impl(); if ( bShow ) + { Show(); + } + if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) ) + { + GrabFocusToFirstControl(); + } + } // ----------------------------------------------------------------------- diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index e03206919106..a9563ae95c57 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -62,7 +62,7 @@ #include <tools/urlobj.hxx> #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> -#include <vcl/window.hxx> +#include <vcl/syswin.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -257,6 +257,14 @@ String SfxViewFrame::UpdateTitle() GetBindings().Invalidate( SID_NEWDOCDIRECT ); + // MT: GetTopFrame_Impl doesn't exist anymore: Window* pWindow = GetTopFrame_Impl()->GetTopWindow_Impl(); + // Is GetFrame correct??? + Window* pWindow = GetFrame().GetTopWindow_Impl(); + if ( pWindow) + { + pWindow->SetAccessibleName( String() ); + pWindow->SetAccessibleName( aTitle ); + } return aTitle; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index debf6e2a0419..68520ad98734 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8917,7 +8917,11 @@ void Window::SetAccessibleName( const String& rName ) DBG_ASSERT( !mpWindowImpl->mpAccessibleInfos->pAccessibleName || !rName.Len(), "AccessibleName already set!" ); delete mpWindowImpl->mpAccessibleInfos->pAccessibleName; - mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( rName ); + mpWindowImpl->mpAccessibleInfos->pAccessibleName = NULL; + if( rName.Len() ) + { + mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( GetNonMnemonicString(rName) ); + } } String Window::GetAccessibleName() const |