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 @@ -183,13 +183,13 @@ void SlideSorterViewShell::Initialize (void) mpContentWindow, mpHorizontalScrollBar, mpVerticalScrollBar, mpScrollBarBox); mpView = &mpSlideSorter->GetView(); - ViewShell::doShow(); + doShow(); SetPool( &GetDoc()->GetPool() ); SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() ); // For accessibility we have to shortly hide the content window. // This triggers the construction of a new accessibility object for 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 @@ -479,13 +479,13 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi FrameView* pFrameViewArgument ) :ViewShell(pFrame, pParentWindow, rViewShellBase) ,mpImpl( new ToolPanelViewShell_Impl( *this, *mpContentWindow.get() ) ) ,mpSubShellManager() ,mnMenuId(0) { - ViewShell::doShow(); + doShow(); meShellType = ST_TASK_PANE; mpContentWindow->SetCenterAllowed( false ); pParentWindow->SetStyle( pParentWindow->GetStyle() | WB_DIALOGCONTROL ); 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 @@ -134,19 +134,18 @@ void SAL_CALL ScannerEventListener::disposing( const ::com::sun::star::lang::Eve DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) : ViewShell (pFrame, pParentWindow, rViewShellBase) , maTabControl(this, pParentWindow) , mbIsLayerModeActive(false) , mbIsInSwitchPage(false) { - ViewShell::doShow(); - if (pFrameViewArgument != NULL) mpFrameView = pFrameViewArgument; else mpFrameView = new FrameView(GetDoc()); Construct(GetDocSh(), ePageKind); + doShow(); } /************************************************************************* |* |* Destruktor |* 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 @@ -219,22 +219,22 @@ OutlineViewShell::OutlineViewShell ( pLastPage( NULL ), pClipEvtLstnr(NULL), bPastePossible(false), mbInitialized(false) { - ViewShell::doShow(); - if (pFrameViewArgument != NULL) mpFrameView = pFrameViewArgument; else mpFrameView = new FrameView(GetDoc()); mpFrameView->Connect(); Construct(GetDocSh()); + + doShow(); } /************************************************************************* |* |* Destructor |* |