summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-09 10:52:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-09 10:20:02 +0000
commit6744039f1becbc182445685a5cba3ed8a0be2705 (patch)
tree990ef124d165a286fce9ae54bc84a3c2b9cd88ad
parent3d7d318914bd69262da647e0db23ec47d6550afe (diff)
Related: tdf#101921 get taborder to match visual order
Change-Id: I5cf751266c021de469ae57697c1ad25130ee09d4 Reviewed-on: https://gerrit.libreoffice.org/28768 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
-rw-r--r--sfx2/source/inc/templdgi.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 55909bdaa7f9..9ba17a57b8c1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -689,8 +689,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl
, m_pDeletionWatcher(nullptr)
, aFmtLb( VclPtr<SfxActionListBox>::Create(this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH) )
- , aFilterLb( VclPtr<ListBox>::Create(pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP) )
, aPreviewCheckbox( VclPtr<CheckBox>::Create( pW, WB_VCENTER ))
+ , aFilterLb( VclPtr<ListBox>::Create(pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP) )
, nActFamily(0xffff)
, nActFilter(0)
@@ -917,8 +917,8 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
if ( m_pDeletionWatcher )
m_pDeletionWatcher->signal();
aFmtLb.disposeAndClear();
- aFilterLb.disposeAndClear();
aPreviewCheckbox.disposeAndClear();
+ aFilterLb.disposeAndClear();
}
// Helper function: Access to the current family item
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8300daa13a1d..d641b83f8ea8 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -185,8 +185,8 @@ protected:
DeletionWatcher* m_pDeletionWatcher;
VclPtr<SfxActionListBox> aFmtLb;
- VclPtr<ListBox> aFilterLb;
VclPtr<CheckBox> aPreviewCheckbox;
+ VclPtr<ListBox> aFilterLb;
sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
sal_uInt16 nActFilter; // FilterIdx