diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-09 12:39:28 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-09 12:41:39 +0100 |
commit | 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e (patch) | |
tree | d32bfb2ced7b574e5e220bc822570893ff351b88 | |
parent | f802b568d639950c2f8005cf143fd628cc29a3a0 (diff) |
Resolves: rhbz#805743 a11y: call doShow after we have a valid view
Basically a regression from ec240eafe9b25620383aa54015f5c55e0f64227a but things
were broken before that too.
enable a11y (for gnome 3 this is gsettings set org.gnome.desktop.interface
toolkit-accessibility true), and run the smoketest with dbg-util before
touching this stuff
Change-Id: I I55f4e22d8ac61c7ac3ccc37b82794604b28a8f14
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index a9b09a9a0a17..7b874c0a7715 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | |||
@@ -186,7 +186,7 @@ void SlideSorterViewShell::Initialize (void) | |||
186 | mpScrollBarBox); | 186 | mpScrollBarBox); |
187 | mpView = &mpSlideSorter->GetView(); | 187 | mpView = &mpSlideSorter->GetView(); |
188 | 188 | ||
189 | ViewShell::doShow(); | 189 | doShow(); |
190 | 190 | ||
191 | SetPool( &GetDoc()->GetPool() ); | 191 | SetPool( &GetDoc()->GetPool() ); |
192 | SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() ); | 192 | SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() ); |
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx index 12f65150267e..8eb9bc7f8800 100644 --- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx +++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx | |||
@@ -482,7 +482,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi | |||
482 | ,mpSubShellManager() | 482 | ,mpSubShellManager() |
483 | ,mnMenuId(0) | 483 | ,mnMenuId(0) |
484 | { | 484 | { |
485 | ViewShell::doShow(); | 485 | doShow(); |
486 | 486 | ||
487 | meShellType = ST_TASK_PANE; | 487 | meShellType = ST_TASK_PANE; |
488 | 488 | ||
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 0d1b5acf6e1d..1dabda61b6c3 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx | |||
@@ -137,13 +137,12 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas | |||
137 | , mbIsLayerModeActive(false) | 137 | , mbIsLayerModeActive(false) |
138 | , mbIsInSwitchPage(false) | 138 | , mbIsInSwitchPage(false) |
139 | { | 139 | { |
140 | ViewShell::doShow(); | ||
141 | |||
142 | if (pFrameViewArgument != NULL) | 140 | if (pFrameViewArgument != NULL) |
143 | mpFrameView = pFrameViewArgument; | 141 | mpFrameView = pFrameViewArgument; |
144 | else | 142 | else |
145 | mpFrameView = new FrameView(GetDoc()); | 143 | mpFrameView = new FrameView(GetDoc()); |
146 | Construct(GetDocSh(), ePageKind); | 144 | Construct(GetDocSh(), ePageKind); |
145 | doShow(); | ||
147 | } | 146 | } |
148 | 147 | ||
149 | /************************************************************************* | 148 | /************************************************************************* |
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 4f1398904286..f37b7a010926 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx | |||
@@ -222,8 +222,6 @@ OutlineViewShell::OutlineViewShell ( | |||
222 | mbInitialized(false) | 222 | mbInitialized(false) |
223 | 223 | ||
224 | { | 224 | { |
225 | ViewShell::doShow(); | ||
226 | |||
227 | if (pFrameViewArgument != NULL) | 225 | if (pFrameViewArgument != NULL) |
228 | mpFrameView = pFrameViewArgument; | 226 | mpFrameView = pFrameViewArgument; |
229 | else | 227 | else |
@@ -232,6 +230,8 @@ OutlineViewShell::OutlineViewShell ( | |||
232 | mpFrameView->Connect(); | 230 | mpFrameView->Connect(); |
233 | 231 | ||
234 | Construct(GetDocSh()); | 232 | Construct(GetDocSh()); |
233 | |||
234 | doShow(); | ||
235 | } | 235 | } |
236 | 236 | ||
237 | /************************************************************************* | 237 | /************************************************************************* |