Kaydet (Commit) 4a305d02 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Adolfo Jayme Barrientos

tdf#93558 Hardcode black text on white background

As agreed in the bug report, a preview shouldn't be
themed by the OS theme.

(cherry picked from commit fa1807ad)

Conflicts:
	include/svx/numvset.hxx
	svx/source/dialog/svxbmpnumvalueset.cxx

Change-Id: Icdc5021c3ac614fe1d490fd513a407a81dbc169e
Reviewed-on: https://gerrit.libreoffice.org/18068Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 651315ea
...@@ -49,7 +49,6 @@ struct SvxBmpItemInfo ...@@ -49,7 +49,6 @@ struct SvxBmpItemInfo
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{ {
Color aLineColor;
sal_uInt16 nPageType; sal_uInt16 nPageType;
bool bHTMLMode; bool bHTMLMode;
Rectangle aOrgRect; Rectangle aOrgRect;
......
...@@ -141,9 +141,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -141,9 +141,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
25, 90, 25, 90,
}; };
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color aBackColor(COL_WHITE);
const Color aBackColor = rStyleSettings.GetFieldColor(); const Color aTextColor(COL_BLACK);
const Color aTextColor = rStyleSettings.GetFieldTextColor();
vcl::RenderContext* pDev = rUDEvt.GetRenderContext(); vcl::RenderContext* pDev = rUDEvt.GetRenderContext();
Rectangle aRect = rUDEvt.GetRect(); Rectangle aRect = rUDEvt.GetRect();
...@@ -187,10 +186,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -187,10 +186,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
pVDev->SetOutputSize( aRectSize ); pVDev->SetOutputSize( aRectSize );
aOrgRect = aRect; aOrgRect = aRect;
pVDev->SetFillColor( aBackColor ); pVDev->SetFillColor( aBackColor );
pVDev->SetLineColor(COL_LIGHTGRAY);
if(aBackColor == aLineColor)
aLineColor.Invert();
pVDev->SetLineColor(aLineColor);
// Draw line only once // Draw line only once
if(nPageType != NUM_PAGETYPE_NUM) if(nPageType != NUM_PAGETYPE_NUM)
{ {
...@@ -402,7 +398,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP) ...@@ -402,7 +398,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
void SvxNumValueSet::init(sal_uInt16 nType) void SvxNumValueSet::init(sal_uInt16 nType)
{ {
aLineColor = COL_LIGHTGRAY;
nPageType = nType; nPageType = nType;
bHTMLMode = false; bHTMLMode = false;
pVDev = NULL; pVDev = NULL;
......
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