diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-08-27 21:18:58 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-08-28 09:15:27 +0000 |
| commit | 4a305d029116793f1e73019fa1242ded5f5236f2 (patch) | |
| tree | 3063beadf603f2cc8f60594603309cc17f84e2ba | |
| parent | 651315eab0a605fb0a22e74b6daa4417602fc072 (diff) | |
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 fa1807ad5457d10f8fa073c209a27547e8922c8c)
Conflicts:
include/svx/numvset.hxx
svx/source/dialog/svxbmpnumvalueset.cxx
Change-Id: Icdc5021c3ac614fe1d490fd513a407a81dbc169e
Reviewed-on: https://gerrit.libreoffice.org/18068
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | include/svx/numvset.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index aa4f87768d17..0d84894385d7 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -49,7 +49,6 @@ struct SvxBmpItemInfo class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { - Color aLineColor; sal_uInt16 nPageType; bool bHTMLMode; Rectangle aOrgRect; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 5c8157d15e81..cbee541a9127 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -141,9 +141,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) 25, 90, }; - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - const Color aBackColor = rStyleSettings.GetFieldColor(); - const Color aTextColor = rStyleSettings.GetFieldTextColor(); + const Color aBackColor(COL_WHITE); + const Color aTextColor(COL_BLACK); vcl::RenderContext* pDev = rUDEvt.GetRenderContext(); Rectangle aRect = rUDEvt.GetRect(); @@ -187,10 +186,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pVDev->SetOutputSize( aRectSize ); aOrgRect = aRect; pVDev->SetFillColor( aBackColor ); - - if(aBackColor == aLineColor) - aLineColor.Invert(); - pVDev->SetLineColor(aLineColor); + pVDev->SetLineColor(COL_LIGHTGRAY); // Draw line only once if(nPageType != NUM_PAGETYPE_NUM) { @@ -402,7 +398,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP) void SvxNumValueSet::init(sal_uInt16 nType) { - aLineColor = COL_LIGHTGRAY; nPageType = nType; bHTMLMode = false; pVDev = NULL; |