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

[Katarina Behrens]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 3a585777256d99063d7b8bc5b20982d6f5a57574
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Mon Apr 16 09:11:13 2018 +0200

    tdf#94300: Use named gradients | hatches | bitmaps
    
    this helps chart sidebar to identify them by name when switching
    between different kinds of fill types. Also prep work for tdf#113688
    
    Change-Id: I7cb148562cfa50704f27fa3273d93941eb01a7ab
    Reviewed-on: https://gerrit.libreoffice.org/52961
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index d89495d9c732..7127dc0312f9 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -307,7 +307,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
             if(0 < pItem->GetGradientList()->Count())
             {
                 const XGradient aGradient = pItem->GetGradientList()->GetGradient(0)->GetGradient();
-                const XFillGradientItem aXFillGradientItem(aGradient);
+                const OUString aName = pItem->GetGradientList()->GetGradient(0)->GetName();
+                const XFillGradientItem aXFillGradientItem(aName, aGradient);
 
                 // #i122676# change FillStyle and Gradient in one call
                 XFillStyleItem aXFillStyleItem(drawing::FillStyle_GRADIENT);
@@ -346,7 +347,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
                     if(mnLastPosHatch < pXHatchList->Count())
                     {
                         const XHatch aHatch = pXHatchList->GetHatch(mnLastPosHatch)->GetHatch();
-                        const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectedEntry(), aHatch);
+                        const OUString aName = pXHatchList->GetHatch(mnLastPosHatch)->GetName();
+                        const XFillHatchItem aXFillHatchItem(aName, aHatch);
 
                         // #i122676# change FillStyle and Hatch in one call
                         XFillStyleItem aXFillStyleItem(drawing::FillStyle_HATCH);
@@ -392,7 +394,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void)
                         {
                             const XBitmapEntry* pXBitmapEntry = pXBitmapList->GetBitmap(mnLastPosBitmap);
                             aBitmap = pXBitmapEntry->GetGraphicObject();
-                            aName = mpLbFillAttr->GetSelectedEntry();
+                            aName = pXBitmapEntry->GetName();
                             mpLbFillAttr->SelectEntryPos(mnLastPosBitmap);
                         }
                     }