diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-10-26 10:14:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-10-26 12:53:44 +0200 |
| commit | 36b1e1c089c739f232c36ea0f9b0242b6fd578ac (patch) | |
| tree | 4f0a26560bf67eb024b64fd8604d4094c7e7688b | |
| parent | sw html import: fix handling of CDATA (diff) | |
| download | core-36b1e1c089c739f232c36ea0f9b0242b6fd578ac.tar.gz core-36b1e1c089c739f232c36ea0f9b0242b6fd578ac.zip | |
crashreporting: crash in area tab page with insert, envelope
insert, envelope, format, addressee: format: edit: paragraph, area,
click on gradient, bitmap, etc.
Change-Id: I121674776662b31dc4e3cf96fbeb2c1d234ae00e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141839
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
| -rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 26cd00923873..5949c192254f 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -23,10 +23,13 @@ #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include <svtools/unitconv.hxx> +#include <svx/drawitem.hxx> #include <o3tl/string_view.hxx> #include <osl/diagnose.h> #include <cmdid.h> +#include <IDocumentDrawModelAccess.hxx> +#include <drawdoc.hxx> #include <wrtsh.hxx> #include <view.hxx> #include "envfmt.hxx" @@ -221,6 +224,13 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender) // set BoxInfo ::PrepareBoxInfo( aTmpSet, *pSh ); + SwDrawModel* pDrawModel = pSh->GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel(); + aTmpSet.Put(SvxColorListItem(pDrawModel->GetColorList(), SID_COLOR_TABLE)); + aTmpSet.Put(SvxGradientListItem(pDrawModel->GetGradientList(), SID_GRADIENT_LIST)); + aTmpSet.Put(SvxHatchListItem(pDrawModel->GetHatchList(), SID_HATCH_LIST)); + aTmpSet.Put(SvxBitmapListItem(pDrawModel->GetBitmapList(), SID_BITMAP_LIST)); + aTmpSet.Put(SvxPatternListItem(pDrawModel->GetPatternList(), SID_PATTERN_LIST)); + const OUString sFormatStr = pColl->GetName(); SwParaDlg aDlg(GetFrameWeld(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); |