diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-07 15:54:41 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2018-02-08 09:06:44 +0100 |
| commit | de8a1b4f6c8fcca9fc9cc5ad83c393ecd7292f76 (patch) | |
| tree | 95ffc26a4080c97492edee262a521bca60992850 | |
| parent | 5531e6338bc9d7d5676a5c52059d5ccb2fcccb0c (diff) | |
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@yahoo.fr>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | cui/source/dialogs/sdrcelldlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/sdrcelldlg.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
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; |