[Libreoffice-commits] core.git: 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 fa1807ad5457d10f8fa073c209a27547e8922c8c
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.
    
    Change-Id: Icdc5021c3ac614fe1d490fd513a407a81dbc169e

diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 7565178..903921c 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -57,7 +57,6 @@ enum class NumberingPageType
 
 class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
 {
-    Color           aLineColor;
     NumberingPageType ePageType;
     bool            bHTMLMode;
     Rectangle       aOrgRect;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 5d11b04..1d01cd9 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -136,9 +136,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();
@@ -182,10 +181,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(ePageType != NumberingPageType::OUTLINE)
         {
@@ -397,7 +393,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
 
 void SvxNumValueSet::init(NumberingPageType eType)
 {
-    aLineColor = COL_LIGHTGRAY;
     ePageType = eType;
     bHTMLMode = false;
     pVDev = NULL;