commit 6a32a2dfb45865d5bc8986e753260558a7be6429
author Caolán McNamara <caolanm@redhat.com> Thu Aug 06 11:30:49 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Aug 06 13:39:40 2020 +0200
tree d5dcd17bd6541561190cf972f0b2f9205169c990
parent feafbaa0372705be3f4cc4616983fb8641a81d44

tdf#135488 ensure something is selected in experimental theme colorset

so double click without something selected can't normally happen,
and bail out and do nothing if it does happen

Change-Id: Ic9ed756d4b2b51b87f09786ab7b8506b2d720d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100232
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/source/uibase/sidebar/ThemePanel.cxx

diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 18abd15..290ca41 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -444,6 +444,9 @@ ThemePanel::ThemePanel(vcl::Window* pParent,
    }

    mxValueSetColors->SetOptimalSize();

    if (!aColorSets.empty())
        mxValueSetColors->SelectItem(1); // ItemId 1, position 0
}

ThemePanel::~ThemePanel()
@@ -480,17 +483,19 @@ IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl, weld::TreeView&, bool)
void ThemePanel::DoubleClickHdl()
{
    SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
    if (pDocSh)
    {
        OUString sEntryFonts = mxListBoxFonts->get_selected_text();
        sal_uInt32 nItemId = mxValueSetColors->GetSelectedItemId();
        sal_uInt32 nIndex = nItemId - 1;
        OUString sEntryColors = maColorSets.getColorSet(nIndex).getName();
    if (!pDocSh)
        return;

        StyleSet aStyleSet = setupThemes();
    sal_uInt32 nItemId = mxValueSetColors->GetSelectedItemId();
    if (!nItemId)
        return;
    OUString sEntryFonts = mxListBoxFonts->get_selected_text();
    sal_uInt32 nIndex = nItemId - 1;
    OUString sEntryColors = maColorSets.getColorSet(nIndex).getName();

        applyTheme(pDocSh->GetStyleSheetPool(), sEntryFonts, sEntryColors, aStyleSet, maColorSets);
    }
    StyleSet aStyleSet = setupThemes();

    applyTheme(pDocSh->GetStyleSheetPool(), sEntryFonts, sEntryColors, aStyleSet, maColorSets);
}

void ThemePanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,