commit c5dfab1aca06ff52345186cd4bcf42677598c91f
author Caolán McNamara <caolanm@redhat.com> Mon Jul 12 12:19:22 2021 +0100
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tue Jul 13 00:23:34 2021 +0200
tree fa05192f7cb5c0ba74e3fcde704f849a05c05571
parent 4b691594f3b9b1810028b50daa703b33a9e61374

tdf#143291 the "none" item selected is distinct from nothing selected

Change-Id: I2e012df85a5c28f462a6c643d7a9a88f8775e870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118777
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

sd/source/ui/animations/SlideTransitionPane.cxx

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index f3b1f2a..f20e1016 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -407,6 +407,8 @@ SlideTransitionPane::SlideTransitionPane(
    Initialize(pDoc);
}

constexpr sal_uInt16 nNoneId = std::numeric_limits<sal_uInt16>::max();

void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
{
    mxFT_VARIANT = m_xBuilder->weld_label("variant_label");
@@ -442,7 +444,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)

    // dummy list box of slide transitions for startup.
    mxVS_TRANSITION_ICONS->InsertItem(
        0, Image( StockImage::Yes, "sd/cmd/transition-none.png" ),
        nNoneId, Image( StockImage::Yes, "sd/cmd/transition-none.png" ),
        SdResId( STR_SLIDETRANSITION_NONE ),
        VALUESET_APPEND, /* show legend */ true );
    mxVS_TRANSITION_ICONS->Recalculate();
@@ -581,14 +583,14 @@ void SlideTransitionPane::updateControls()
    if( aEffect.mbEffectAmbiguous )
    {
        SAL_WARN( "sd.transitions", "Unusual, ambiguous transition effect" );
        mxVS_TRANSITION_ICONS->SetNoSelection();
        mxVS_TRANSITION_ICONS->SelectItem(nNoneId);
    }
    else
    {
        // ToDo: That 0 is "no transition" is documented nowhere except in the
        // CTOR of sdpage
        if( aEffect.mnType == 0 )
            mxVS_TRANSITION_ICONS->SetNoSelection();
            mxVS_TRANSITION_ICONS->SelectItem(nNoneId);
        else
            updateVariants( getPresetOffset( aEffect ) );
    }
@@ -772,9 +774,11 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
    impl::TransitionEffect aResult;
    aResult.setAllAmbiguous();

    bool bNoneSelected = mxVS_TRANSITION_ICONS->IsNoSelection() || mxVS_TRANSITION_ICONS->GetSelectedItemId() == nNoneId;

    // check first (aResult might be overwritten)
    if(  mxVS_TRANSITION_ICONSWin->get_sensitive() &&
        !mxVS_TRANSITION_ICONS->IsNoSelection() &&
        !bNoneSelected &&
         mxVS_TRANSITION_ICONS->GetSelectedItemId() > 0 )
    {
        const sd::TransitionPresetList& rPresetList = sd::TransitionPreset::getTransitionPresetList();
@@ -815,7 +819,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
        }
        aResult.mbEffectAmbiguous = false;
    }
    else if (mxVS_TRANSITION_ICONS->IsNoSelection())
    else if (bNoneSelected)
    {
        aResult.mbEffectAmbiguous = false;
    }
@@ -1022,7 +1026,7 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset )
{
    const sd::TransitionPresetList& rPresetList = sd::TransitionPreset::getTransitionPresetList();
    mxLB_VARIANT->clear();
    mxVS_TRANSITION_ICONS->SetNoSelection();
    mxVS_TRANSITION_ICONS->SelectItem(nNoneId);

    if( nPresetOffset >= rPresetList.size() )
    {