[Libreoffice-commits] core.git: cui/source

[Katarina Behrens]

 cui/source/tabpages/tparea.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2ee2757f152eadd880f222553daf253d98d31efa
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed Oct 12 10:54:35 2016 +0200

    Avoid one more crash on switching to pattern tab
    
    this one happens when selecting Format > Area with no shape selection
    or in Draw's page properties dialog
    
    Change-Id: I20c94d4ac0c0ad20a4ac3f28275d1ca7f9ccdeb9
    Reviewed-on: https://gerrit.libreoffice.org/29726
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index bfd5a4b..0724505 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -353,6 +353,7 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
     const SvxGradientListItem* pGradientListItem = aSet.GetItem<SvxGradientListItem>(SID_GRADIENT_LIST, false);
     const SvxHatchListItem* pHatchingListItem = aSet.GetItem<SvxHatchListItem>(SID_HATCH_LIST, false);
     const SvxBitmapListItem* pBitmapListItem = aSet.GetItem<SvxBitmapListItem>(SID_BITMAP_LIST, false);
+    const SvxPatternListItem* pPatternListItem = aSet.GetItem<SvxPatternListItem>(SID_PATTERN_LIST, false);
 
     if (pColorListItem)
         SetColorList(pColorListItem->GetColorList());
@@ -362,6 +363,8 @@ void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet)
         SetHatchingList(pHatchingListItem->GetHatchList());
     if (pBitmapListItem)
         SetBitmapList(pBitmapListItem->GetBitmapList());
+    if (pPatternListItem)
+        SetPatternList(pPatternListItem->GetPatternList());
 }
 
 void SvxAreaTabPage::PointChanged( vcl::Window* , RectPoint )