svx/source/tbxctrls/tbxcolorupdate.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit bef9aeb9c4c4e9641cfcaccbcea52ce1a87b6550
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Sun Oct 8 00:13:40 2017 +0300
Remove some old workaround
Can't reproduce the original problem anymore, and in the
meantime the sidebar color button code was totally replaced
with a SvxColorToolBoxControl based solution (see tdf#84844).
So no evidence we still need this special handling of COL_BLACK.
Change-Id: I9ab5e65e6ea1dc599ba850cfcaae62c73947159a
Reviewed-on: https://gerrit.libreoffice.org/43237
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
Tested-by: Maxim Monastirsky <momonas...@gmail.com>
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 56cff24bc5df..7c89b1edd6f2 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -79,12 +79,7 @@ namespace svx
if (aColor.GetColor() == COL_AUTO)
aColor = Color(COL_TRANSPARENT);
- // For a shape selected in 'Draw', when color selected in Sidebar >
Line > Color
- // is COL_BLACK, then (maCurColor != aColor) becomes 'false',
therefore we take
- // explicit care of COL_BLACK from the last argument in the condition
so that the
- // Update() does its routine job appropriately !
- if ((maCurColor != aColor) || (aColor == COL_BLACK) ||
- bSizeChanged || bDisplayModeChanged || bForceUpdate )
+ if ((maCurColor != aColor) || bSizeChanged || bDisplayModeChanged ||
bForceUpdate)
{
// create an empty bitmap, and copy the original bitmap inside
// (so that it grows in case the original bitmap was smaller)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
