[Libreoffice-commits] core.git: vcl/win

Matúš Kukan matus.kukan at collabora.com
Sat Feb 22 01:25:28 PST 2014


 vcl/win/source/window/salframe.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 53ae62d5761034e808596816fd36475a8e02de73
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Sat Feb 22 18:22:00 2014 +0100

    'SetSymbolsStyle' : is not a member of 'StyleSettings'. Remove the call.
    
    Something similar was done in vcl/source/window/window.cxx in commit
    076a7eacca48f203f0a8b9aa537e88fea9a88409 so hopefully this fix is enough.
    
    Change-Id: I11eb3c2d315a918056ffdee16c98c1430e174ed9

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index a217112..7752838 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2862,14 +2862,11 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     // High contrast
     HIGHCONTRAST hc;
     hc.cbSize = sizeof( HIGHCONTRAST );
-    if(    SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0)
-        && (hc.dwFlags & HCF_HIGHCONTRASTON)
-    ) {
-        aStyleSettings.SetHighContrastMode( 1 );
-        aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
-    } else {
-        aStyleSettings.SetHighContrastMode( 0 );
-    }
+    if( SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0 )
+            && (hc.dwFlags & HCF_HIGHCONTRASTON) )
+        aStyleSettings.SetHighContrastMode( true );
+    else
+        aStyleSettings.SetHighContrastMode( false );
 
     // Query Fonts
     Font    aMenuFont = aStyleSettings.GetMenuFont();


More information about the Libreoffice-commits mailing list