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

Stephan Bergmann sbergman at redhat.com
Wed Feb 26 06:01:23 PST 2014


 vcl/source/app/settings.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 844d1a89591df48a75a93e2db53e369175428d51
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 26 15:00:32 2014 +0100

    sal_Bool -> bool fixup
    
    Change-Id: I1104fc57f9f82944d258208f70993da1b00f1843

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 2eeef09..991f9de 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -171,7 +171,7 @@ struct ImplStyleData
     sal_uLong                       mnLogoDisplayTime;
     sal_uLong                       mnDisplayOptions;
     sal_uLong                       mnToolbarIconSize;
-    sal_uLong                       mnUseFlatMenus;
+    bool                            mnUseFlatMenus;
     sal_uLong                       mnOptions;
     sal_uInt16                      mnScreenZoom;
     sal_uInt16                      mnScreenFontZoom;
@@ -179,7 +179,7 @@ struct ImplStyleData
     bool                            mbUseSystemUIFonts;
     bool                            mbAutoMnemonic;
     TriState                        meUseImagesInMenus;
-    sal_uLong                       mnUseFlatBorders;
+    bool                            mnUseFlatBorders;
     bool                            mbPreferredUseImagesInMenus;
     long                            mnMinThumbSize;
     boost::shared_ptr<vcl::IconThemeScanner>
@@ -879,9 +879,9 @@ void ImplStyleData::SetStandardStyles()
     mnTearOffTitleHeight        = 8;
     mnMenuBarHeight             = 14;
     mbHighContrast              = false;
-    mbUseSystemUIFonts          = 1;
-    mnUseFlatBorders            = 0;
-    mnUseFlatMenus              = 0;
+    mbUseSystemUIFonts          = true;
+    mnUseFlatBorders            = false;
+    mnUseFlatMenus              = false;
     mbPreferredUseImagesInMenus = true;
     mbSkipDisabledInMenus       = false;
     mbHideDisabledMenuItems     = false;


More information about the Libreoffice-commits mailing list