diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-16 09:11:13 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-18 10:23:59 +0200 |
| commit | 3a585777256d99063d7b8bc5b20982d6f5a57574 (patch) | |
| tree | 57e0d494f417a65d40794c221b309773c2561037 | |
| parent | 02e5ff1d9b12c12fcaaa929c6dea626eefc5bb8c (diff) | |
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@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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); } } |