diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-06-19 15:28:40 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-06-19 13:36:37 +0200 |
commit | 2afff27c5327bcb30f894d9a507131f2ad8f1dc6 (patch) | |
tree | 96ec30761084bdfd162674338d489ca110b8153c /sd/source/ui | |
parent | 703c28d76924bcbda3f492de8a14cc9c30ee1dfb (diff) |
tdf#155086 remove code that sets theme color to shapes as DF
Remove this functionallity for now until we support theme colors
in shape styles. Then we can do it for the default style, and not
as a direct format for each inserted shape.
Change-Id: Ib042072954a79cadc750372333c40269fbe4ca40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153244
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/func/fuconstr.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 4db1f4042dc9..fd93a3ce7c94 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -371,42 +371,6 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, pObj->SetMergedItemSet(aAttr); } } - else - { - // Creating an object with fill. - SdrPage* pThemePage = pPage; - if (pThemePage->TRG_HasMasterPage()) - { - pThemePage = &pThemePage->TRG_GetMasterPage(); - } - - auto const& pTheme = pThemePage->getSdrPageProperties().GetTheme(); - if (pTheme) - { - // We construct an object on a page where the master page has a theme. Take the - // accent1 color from that theme, make sure it has priority over the shape's - // document-global style. - SfxItemSet aAttr(mpView->GetDefaultAttr()); - - aAttr.Put(XFillStyleItem(css::drawing::FillStyle_SOLID)); - - model::ThemeColorType eColorType = model::ThemeColorType::Accent1; - Color aColor = pTheme->GetColor(eColorType); - XFillColorItem aFillColorItem("", aColor); - aFillColorItem.getComplexColor().setSchemeColor(eColorType); - aAttr.Put(aFillColorItem); - - aAttr.Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); - - // Line color is 50% darker than the fill color. - aColor.ApplyTintOrShade(-5000); - XLineColorItem aLineColorItem("", aColor); - // TODO no theme or theme effect for line colors yet. - aAttr.Put(aLineColorItem); - - pObj->SetMergedItemSet(aAttr); - } - } } } |