diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-07 15:54:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-02-13 16:16:59 +0100 |
| commit | d43502a51d5ea1ef81fb4fdb4c5bfb68017eecbe (patch) | |
| tree | b4a1fc052fabb587f2eff2a570252a2ba05687ac | |
| parent | 505832b92e0e2a395ef22424de33168a76bcc2c3 (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>
(cherry picked from commit de8a1b4f6c8fcca9fc9cc5ad83c393ecd7292f76)
Reviewed-on: https://gerrit.libreoffice.org/49406
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -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 d6e9244cb738..160477c157b9 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -34,6 +34,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); @@ -51,6 +52,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 f5939979b96d..6b41e69fc8b3 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; |