Kaydet (Commit) 3a585777 authored tarafından Katarina Behrens's avatar Katarina Behrens

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/52961Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 02e5ff1d
......@@ -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);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment