[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx svx/source

[Maxim Monastirsky]

 include/svx/numvset.hxx                 |    1 -
 svx/source/dialog/svxbmpnumvalueset.cxx |   11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 4a305d029116793f1e73019fa1242ded5f5236f2
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Aug 27 21:18:58 2015 +0300

    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 at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index aa4f8776..0d84894 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 5c8157d..cbee541 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;