[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svtools/source

[Michael Meeks]

 svtools/source/control/ruler.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e0a7557e97de0bad7ff8510c768bdbed6cdae6f5
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Thu Jul 24 14:24:25 2014 -0400

    fdo#51534 - rulers should have app-background by default (apparently).
    
    Change-Id: I981febb02074ed323732ef7c19e89f1e946604f1
    Reviewed-on: https://gerrit.libreoffice.org/10519
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Tested-by: Jan Holesovsky <ke...@collabora.com>

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 4332966..29655de 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -27,6 +27,7 @@
 #include <svtools/ruler.hxx>
 #include <svtools/svtresid.hxx>
 #include <svtools/svtools.hrc>
+#include <svtools/colorcfg.hxx>
 
 #include <boost/scoped_array.hpp>
 #include <vector>
@@ -1021,7 +1022,10 @@ void Ruler::ImplInitSettings( bool bFont, bool 
bForeground, bool bBackground )
         if ( IsControlBackground() )
             aColor = GetControlBackground();
         else
-            aColor = rStyleSettings.GetDialogColor();
+        {
+            svtools::ColorConfig aColorConfig;
+            aColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND 
).nColor );
+        }
         SetBackground( aColor );
     }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits