[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/envelp/envfmt.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 36b1e1c089c739f232c36ea0f9b0242b6fd578ac
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 26 10:14:33 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 26 12:53:44 2022 +0200

    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.st...@allotropia.de>
    Tested-by: Jenkins

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);