diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-08-31 11:47:49 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-09-09 11:58:20 +0200 |
commit | e63d875ee87728cb5b3f0739072e719b80f64427 (patch) | |
tree | 168ba2cc39a5bdd88a34f13be79aa305f249c920 /cui | |
parent | tdf#136062 Don't use 'Reject (All)/Clear formatting' buttons in Calc (diff) | |
download | core-e63d875ee87728cb5b3f0739072e719b80f64427.tar.gz core-e63d875ee87728cb5b3f0739072e719b80f64427.zip |
Resolves: tdf#136189 don't try and sort until treeview is filled
Change-Id: Ic5ac71d88bab7627e14220912f4b9c935f2f1f26
and...
Related: tdf#136189 don't assert on unsetting non-existing previous sort column
Change-Id: If2330cc83ace9ec0133b99eec8c2f0be3919013e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101710
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit c52ac477beefc46802148033adbca9edb9970ac1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101967
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/optaboutconfig.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index a5adf7638c8d..217b0bc5308f 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -181,7 +181,9 @@ IMPL_LINK(CuiAboutConfigTabPage, HeaderBarClick, int, nColumn, void) } else { - m_xPrefBox->set_sort_indicator(TRISTATE_INDET, m_xPrefBox->get_sort_column()); + int nOldSortColumn = m_xPrefBox->get_sort_column(); + if (nOldSortColumn != -1) + m_xPrefBox->set_sort_indicator(TRISTATE_INDET, nOldSortColumn); m_xPrefBox->set_sort_column(nColumn); } |