summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-04-16 10:11:26 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-04-16 11:53:59 +0200
commitd9420a64fbb288020d33b681f40a858db49afca7 (patch)
tree7e05e67570e4bd9729ada7c433ea5488591e4c35 /stoc
parentceb4bc418cd4c03a4e78f4a84ae2d56a71799a31 (diff)
tdf#117028 sw: conditionally consider fill of shape for in-textbox auto color
Commit f966767e1ccfa432da33e1a0fd6de69e17a36bc3 (tdf#116925 sw: consider fill styles of shape for in-textbox auto color, 2018-04-10) did this unconditionally, but there are two cases: 1) Shape (with textbox) has a fill, in that case auto text color of textbox should consider the shape fill. 2) Shape has no fill, in that case the shape fill should not be considered when counting the background of a transparent fly frame. Fix 2) without breaking 1) by making the change to SwFrame::GetBackgroundBrush() opt-in, and only use it for auto font color, not in other cases. Change-Id: I761a1b7d6ecf47586edbe5641ec012f22f6a53d7 Reviewed-on: https://gerrit.libreoffice.org/52941 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'stoc')
0 files changed, 0 insertions, 0 deletions