diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-05-06 15:17:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-06 15:03:09 +0000 |
| commit | e2f38ef8b6a5e30bee9e05fba7aec47287dddae4 (patch) | |
| tree | d8863d458d5782ec66908c9ed2d6fae853790ff6 | |
| parent | b26b9606efa30c0a44e20dcf638fbd1e27f05089 (diff) | |
fdo#73766 TemplateManager: construct toolbars in focus traversal order.
Focus traversal happens in the order that UI items are initialised. As
the "TemplateBar" (i.e. actions that can be used on a selected template)
is to the left of the "ActionBar" (i.e. search/etc.), the TemplateBar
would be expected to be first in the traversal order.
This patch is only relevant for LibreOffice 4.2 -- in master (to become 4.3)
this dialog has already been converted to .ui, and focus traversal works
as expected.
Change-Id: I3328f2e79a8e5a781aceb29f79d0c54d4b421e74
Reviewed-on: https://gerrit.libreoffice.org/9257
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sfx2/inc/templatedlg.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx index b36e96e7e02f..2f7ce6ed4546 100644 --- a/sfx2/inc/templatedlg.hxx +++ b/sfx2/inc/templatedlg.hxx @@ -141,8 +141,8 @@ private: Edit *mpSearchEdit; ToolBox *mpViewBar; - ToolBox *mpActionBar; ToolBox *mpTemplateBar; + ToolBox *mpActionBar; TemplateSearchView *mpSearchView; TemplateAbstractView *mpCurView; TemplateLocalView *mpLocalView; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 07c054f0ee7f..759d2d4c0c0f 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -153,8 +153,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) maTabPage(&maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), mpSearchEdit(new Edit(&maTabPage,WB_HIDE | WB_BORDER)), mpViewBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_VIEW))), - mpActionBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_ACTION))), mpTemplateBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_TEMPLATES))), + mpActionBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_ACTION))), mpSearchView(new TemplateSearchView(&maTabPage)), mpLocalView(new TemplateLocalView(&maTabPage,SfxResId(TEMPLATE_VIEW))), mpRemoteView(new TemplateRemoteView(&maTabPage, WB_VSCROLL,false)), |