diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:59:21 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:59:21 +0000 |
| commit | b0a6cd14357d90e636e11e4a04fb06fe574da7da (patch) | |
| tree | dd53c65eedc379a0939da574f022f203d90c3e9d /sd | |
| parent | c01901076f65097060edf52eb73431a4052d4a0a (diff) | |
CWS-TOOLING: integrate CWS impressaccessibility4
2009-09-16 19:30:19 +0200 af r276217 : #i80994# Fixed the triggering of accessibility initialization.
2009-09-16 18:43:57 +0200 af r276214 : #i93083# ValueSet now handles the FOCUSED and FOCUSABLE states correctly.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 770e50832a68..9d0dbae862fa 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -194,14 +194,6 @@ void SlideSorter::Init (void) // Set view pointer of base class. SetupControls(pParentWindow); - // For accessibility we have to shortly hide the content window. - // This triggers the construction of a new accessibility object for - // the new view shell. (One is created earlier while the construtor - // of the base class is executed. At that time the correct - // accessibility object can not be constructed.) - pWindow->Hide(); - pWindow->Show(); - mbIsValid = true; } } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 952198795764..0a04a236511c 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -185,6 +185,18 @@ void SlideSorterViewShell::Initialize (void) mpVerticalScrollBar, mpScrollBarBox); mpView = &mpSlideSorter->GetView(); + + // For accessibility we have to shortly hide the content window. + // This triggers the construction of a new accessibility object for + // the new view shell. (One is created earlier while the construtor + // of the base class is executed. At that time the correct + // accessibility object can not be constructed.) + ::Window* pWindow = mpSlideSorter->GetActiveWindow(); + if (pWindow != NULL) + { + pWindow->Hide(); + pWindow->Show(); + } } |