[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/tppattern.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f207e283b756ea40721a46440d235836dcb79568
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sat Jul 28 00:37:30 2018 -0800
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 3 17:14:00 2018 +0200

    tdf#118976 Make area pattern tab page display pattern preview
    
    Change-Id: If30b83ec93897b85784d66c699ece377f47f68d4
    Reviewed-on: https://gerrit.libreoffice.org/58265
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 623cb7a1299386f8d8f7c53b0369a40cae51b752)
    Reviewed-on: https://gerrit.libreoffice.org/58366
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 4768d0189a49..8f06c8051fec 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -320,6 +320,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void)
             // update m_pBitmapCtl, rXFSet and m_pCtlPreview
             m_pBitmapCtl->SetPixelColor( aPixelColor );
             m_pBitmapCtl->SetBackgroundColor( aBackColor );
+            m_rXFSet.ClearItem();
+            m_rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
             m_rXFSet.Put(XFillBitmapItem(OUString(), Graphic(m_pBitmapCtl->GetBitmapEx())));
             m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
             m_pCtlPreview->Invalidate();