[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/dialog/templdlg.cxx |    4 ++--
 sfx2/source/inc/templdgi.hxx    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6744039f1becbc182445685a5cba3ed8a0be2705
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 9 10:52:25 2016 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 55909bd..9ba17a5 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 8300daa..d641b83 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