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

[Tamás Zolnai]

 cui/source/dialogs/sdrcelldlg.cxx |    2 ++
 cui/source/inc/sdrcelldlg.hxx     |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 10a5ea8f6365236fcc1d31b940113b3363f56209
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed Feb 7 15:54:41 2018 +0100

    tdf#115506: Crash when trying to set pattern fill for tables in Impress
    
    Setting pattern list was missed in this specific dialog.
    
    Change-Id: I9f47e9e0dd4f99bf5403c70685508b0f14a5bd61
    Reviewed-on: https://gerrit.libreoffice.org/49361
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit de8a1b4f6c8fcca9fc9cc5ad83c393ecd7292f76)
    Reviewed-on: https://gerrit.libreoffice.org/49404
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 7011a4de1d9c..7789ddd64c13 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -33,6 +33,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemS
     , mpGradientList(pModel->GetGradientList())
     , mpHatchingList(pModel->GetHatchList())
     , mpBitmapList(pModel->GetBitmapList())
+    , mpPatternList(pModel->GetPatternList())
     , m_nAreaPageId(0)
 {
     AddTabPage("name", RID_SVXPAGE_CHAR_NAME);
@@ -50,6 +51,7 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         rAreaPage.SetGradientList( mpGradientList );
         rAreaPage.SetHatchingList( mpHatchingList );
         rAreaPage.SetBitmapList( mpBitmapList );
+        rAreaPage.SetPatternList( mpPatternList );;
         rAreaPage.ActivatePage( mrOutAttrs );
     }
     else if (nId == m_nBorderPageId)
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index f5976be5d7f6..97a2abeec613 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -34,6 +34,7 @@ private:
     XGradientListRef    mpGradientList;
     XHatchListRef       mpHatchingList;
     XBitmapListRef      mpBitmapList;
+    XPatternListRef     mpPatternList;
 
     sal_uInt16          m_nAreaPageId;
     sal_uInt16          m_nBorderPageId;