diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-03-13 22:16:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-19 21:29:26 +0100 |
| commit | 21f220fce05bb99964f098247786eec014e56902 (patch) | |
| tree | b7382942cadd1f8607fdca611ff7408bb8daf9d5 /sfx2 | |
| parent | ofz#6999 check available data len (diff) | |
| download | core-21f220fce05bb99964f098247786eec014e56902.tar.gz core-21f220fce05bb99964f098247786eec014e56902.zip | |
tdf#91106 sfx2: Stylist hierarchical: sort the Default Style first
(regression from 41af2a9e26f3ee6b505b343120d5df3617ba5c49)
(cherry picked from commit fd67ee14e769ebdf1e43d55e0117f70f90d53053)
Change-Id: I47377447dd1e04a44033dea27ce7307a65821737
Reviewed-on: https://gerrit.libreoffice.org/51244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 0e3f8e54a92b..aab3bc258236 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -561,6 +561,10 @@ StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr) // tdf#91106 sort top level styles std::sort(rArr.begin(), rArr.end(), [&aSorter](StyleTree_Impl* pEntry1, StyleTree_Impl* pEntry2) { + if (pEntry2->getName() == "Default Style") + return false; + if (pEntry1->getName() == "Default Style") + return true; // default always first return aSorter.compare(pEntry1->getName(), pEntry2->getName()) < 0; }); |