commit d7cf742cde9b174cf83c416fc1618da80a3a13f0
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Sun Nov 10 19:03:14 2019 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Wed Nov 20 23:45:41 2019 +0100
tree 0991793f3dee16281c85ff5184981ab5e4465f92
parent 26c6e23155b151c3f05f3cfdde2bd842aef05306

tdf#125449 Fix custom gradient fill settings being lost

Change-Id: Ia2377274e0fc9da5873bf55735af25ed6ae3d65c
Reviewed-on: https://gerrit.libreoffice.org/82393
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 53c474633c4e658f096669fb0225d751a5701aaf)
Reviewed-on: https://gerrit.libreoffice.org/83186
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 5979fc4a3fa5713b8df49ba624445ce9ed4ccace)
Reviewed-on: https://gerrit.libreoffice.org/83287

cui/source/tabpages/tpgradnt.cxx

diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index bf437d9..9dfca896 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -202,11 +202,11 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
    {
        pXGradient.reset(new XGradient( m_pGradientList->GetGradient( static_cast<sal_uInt16>(nPos) )->GetGradient() ));
        aString = m_xGradientLB->GetItemText( m_xGradientLB->GetSelectedItemId() );
        rSet->Put( XFillGradientItem( aString, *pXGradient ) );
    }
    else
    // gradient was passed (unidentified)
    {
        aString = "gradient";
        pXGradient.reset(new XGradient( m_xLbColorFrom->GetSelectEntryColor(),
                    m_xLbColorTo->GetSelectEntryColor(),
                    static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()),
@@ -217,6 +217,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
                    static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)),
                    static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)),
                    static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ));
        rSet->Put( XFillGradientItem( OUString(), *pXGradient ) );
    }

    sal_uInt16 nValue = 0;
@@ -225,7 +226,6 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )

    assert( pXGradient && "XGradient could not be created" );
    rSet->Put( XFillStyleItem( drawing::FillStyle_GRADIENT ) );
    rSet->Put( XFillGradientItem( aString, *pXGradient ) );
    rSet->Put( XGradientStepCountItem( nValue ) );
    return true;
}