[Libreoffice-commits] core.git: 2 commits - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/tpbitmap.cxx  |    2 ++
 cui/source/tabpages/tppattern.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 623cb7a1299386f8d8f7c53b0369a40cae51b752
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sat Jul 28 00:37:30 2018 -0800
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Jul 31 13:36:21 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>

diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 6ac3c4c19650..7d864da0326f 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();
commit 10b865fc00a97e5ad0bf76cb9bad774933e25461
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Fri Jul 27 15:43:11 2018 -0800
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Jul 31 13:36:09 2018 +0200

    tdf#117892 Blue Area/Background Bitmap tabpage Preview fix
    
    Change-Id: Iaef3651407d1df85b1cb221821d47c33e111016e
    Reviewed-on: https://gerrit.libreoffice.org/58206
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 83c072503a50..982d15ae2669 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -525,6 +525,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void)
         ModifyBitmapStyleHdl( *m_pBitmapStyleLB );
         ModifyBitmapPositionHdl( *m_pPositionLB );
 
+        m_rXFSet.ClearItem();
+
         m_rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
         m_rXFSet.Put(XFillBitmapItem(OUString(), *pGraphicObject));